Module Name: src
Committed By: tsutsui
Date: Tue Apr 21 15:17:58 UTC 2009
Modified Files:
src/sys/arch/landisk/stand/boot: Makefile.boot conf.c
src/sys/arch/landisk/stand/bootxx: Makefile
Added Files:
src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2: Makefile
Log Message:
Add UFS2 boot support. Tested on lantank.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/landisk/stand/boot/Makefile.boot \
src/sys/arch/landisk/stand/boot/conf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/landisk/stand/bootxx/Makefile
cvs rdiff -u -r0 -r1.1 \
src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile
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/landisk/stand/boot/Makefile.boot
diff -u src/sys/arch/landisk/stand/boot/Makefile.boot:1.1 src/sys/arch/landisk/stand/boot/Makefile.boot:1.2
--- src/sys/arch/landisk/stand/boot/Makefile.boot:1.1 Fri Sep 1 21:26:18 2006
+++ src/sys/arch/landisk/stand/boot/Makefile.boot Tue Apr 21 15:17:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.1 2006/09/01 21:26:18 uwe Exp $
+# $NetBSD: Makefile.boot,v 1.2 2009/04/21 15:17:58 tsutsui Exp $
PROG?= boot
@@ -17,7 +17,8 @@
LDFLAGS+= -e boot_start
CFLAGS=
-CPPFLAGS= -DSUPPORT_UFS
+CPPFLAGS= -DSUPPORT_FFSv1
+CPPFLAGS+= -DSUPPORT_FFSv2
CPPFLAGS+= -DSUPPORT_DOSFS
CPPFLAGS+= -DDBMONITOR
#CPPFLAGS+= -DDEBUG
Index: src/sys/arch/landisk/stand/boot/conf.c
diff -u src/sys/arch/landisk/stand/boot/conf.c:1.1 src/sys/arch/landisk/stand/boot/conf.c:1.2
--- src/sys/arch/landisk/stand/boot/conf.c:1.1 Fri Sep 1 21:26:18 2006
+++ src/sys/arch/landisk/stand/boot/conf.c Tue Apr 21 15:17:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
+/* $NetBSD: conf.c,v 1.2 2009/04/21 15:17:58 tsutsui Exp $ */
/*
* Copyright (c) 1996
@@ -42,18 +42,20 @@
#include "biosdisk.h"
struct devsw devsw[] = {
-#if defined(SUPPORT_UFS)
-{ "hd", biosdisk_strategy, biosdisk_open, biosdisk_close, biosdisk_ioctl},
-#endif
+ { "hd", biosdisk_strategy, biosdisk_open, biosdisk_close,
+ biosdisk_ioctl},
};
int ndevs = sizeof(devsw) / sizeof(devsw[0]);
struct fs_ops file_system[] = {
-#ifdef SUPPORT_UFS
-{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
+#ifdef SUPPORT_FFSv1
+ FS_OPS(ffsv1),
+#endif
+#ifdef SUPPORT_FFSv2
+ FS_OPS(ffsv2),
#endif
#ifdef SUPPORT_DOSFS
-{ dosfs_open, dosfs_close, dosfs_read, dosfs_write, dosfs_seek, dosfs_stat },
+ FS_OPS(dosfs),
#endif
};
int nfsys = sizeof(file_system) / sizeof(file_system[0]);
Index: src/sys/arch/landisk/stand/bootxx/Makefile
diff -u src/sys/arch/landisk/stand/bootxx/Makefile:1.2 src/sys/arch/landisk/stand/bootxx/Makefile:1.3
--- src/sys/arch/landisk/stand/bootxx/Makefile:1.2 Tue Nov 14 14:09:54 2006
+++ src/sys/arch/landisk/stand/bootxx/Makefile Tue Apr 21 15:17:58 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/11/14 14:09:54 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/21 15:17:58 tsutsui Exp $
-SUBDIR= bootxx_ffsv1
+SUBDIR= bootxx_ffsv1 bootxx_ffsv2
LIBOBJ= ${.OBJDIR}
.MAKEOVERRIDES+= LIBOBJ
Added files:
Index: src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile
diff -u /dev/null src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile:1.1
--- /dev/null Tue Apr 21 15:17:59 2009
+++ src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile Tue Apr 21 15:17:58 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/04/21 15:17:58 tsutsui Exp $
+
+FS= ffsv2
+
+.include "../Makefile.bootxx"
