Module Name: src
Committed By: jdc
Date: Sun Aug 16 10:58:54 UTC 2015
Modified Files:
src/sys/arch/sparc/stand/bootblk: bootblk.fth genlfs.cf
Log Message:
Make these compile again after changes to LFS.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/stand/bootblk/bootblk.fth
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc/stand/bootblk/genlfs.cf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/bootblk/bootblk.fth
diff -u src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.13 src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.14
--- src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.13 Thu Jun 24 00:54:12 2010
+++ src/sys/arch/sparc/stand/bootblk/bootblk.fth Sun Aug 16 10:58:54 2015
@@ -1,4 +1,4 @@
-\ $NetBSD: bootblk.fth,v 1.13 2010/06/24 00:54:12 eeh Exp $
+\ $NetBSD: bootblk.fth,v 1.14 2015/08/16 10:58:54 jdc Exp $
\
\ IEEE 1275 Open Firmware Boot Block
\
@@ -605,7 +605,7 @@ create cur-blockno -1 l, -1 l, \ Curren
boot-debug? if ." LFS v2" cr then
init-lfs-common
' lfs_bsize to fs-bsize
- ' ifile_SIZEOF to /ifile
+ ' ifile32_SIZEOF to /ifile
' if2_daddr to if_daddr
;
@@ -890,7 +890,7 @@ create cur-blockno -1 l, -1 l, \ Curren
: do-boot ( bootfile -- )
." NetBSD IEEE 1275 Multi-FS Bootblock" cr
- ." Version $NetBSD: bootblk.fth,v 1.13 2010/06/24 00:54:12 eeh Exp $" cr
+ ." Version $NetBSD: bootblk.fth,v 1.14 2015/08/16 10:58:54 jdc Exp $" cr
boot-path load-file ( -- load-base )
dup 0<> if " init-program " evaluate then
;
Index: src/sys/arch/sparc/stand/bootblk/genlfs.cf
diff -u src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.2 src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.3
--- src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.2 Mon Jun 10 10:26:22 2013
+++ src/sys/arch/sparc/stand/bootblk/genlfs.cf Sun Aug 16 10:58:54 2015
@@ -1,4 +1,4 @@
-# $NetBSD: genlfs.cf,v 1.2 2013/06/10 10:26:22 hannken Exp $
+# $NetBSD: genlfs.cf,v 1.3 2015/08/16 10:58:54 jdc Exp $
# Copyright (c) 2010 Eduardo Horvath.
# All rights reserved.
@@ -63,16 +63,16 @@ member if1_version if_version
member if1_daddr if_daddr
#
-# LFS v2 ifile
+# LFS v2 ifile32
#
-struct ifile
+struct ifile32
member if2_version if_version
member if2_daddr if_daddr
#
# LFS v1 dinode
#
-struct ulfs1_dinode
+struct lfs32_dinode
member di_inumber di_inumber
define lfs_magic_value LFS_MAGIC
