Module Name: src
Committed By: tsutsui
Date: Tue Apr 21 16:08:40 UTC 2009
Modified Files:
src/sys/arch/pmax/stand: Makefile
src/sys/arch/pmax/stand/bootxx_ffs: Makefile
src/sys/arch/pmax/stand/common: conf.c
Added Files:
src/sys/arch/pmax/stand/bootxx_ffsv2: Makefile
Log Message:
Add UFS2 boot support. Tested on gxemul.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/pmax/stand/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/pmax/stand/bootxx_ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/pmax/stand/common/conf.c
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/pmax/stand/Makefile
diff -u src/sys/arch/pmax/stand/Makefile:1.18 src/sys/arch/pmax/stand/Makefile:1.19
--- src/sys/arch/pmax/stand/Makefile:1.18 Thu Apr 4 22:59:33 2002
+++ src/sys/arch/pmax/stand/Makefile Tue Apr 21 16:08:39 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/04/04 22:59:33 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2009/04/21 16:08:39 tsutsui Exp $
# @(#)Makefile 8.3 (Berkeley) 2/16/94
# first stage bootblocks
-SUBDIR+=bootxx_cd9660 bootxx_ffs bootxx_lfs netboot
+SUBDIR+=bootxx_cd9660 bootxx_ffs bootxx_ffsv2 bootxx_lfs netboot
# remove this when netboot is working - we don't go in here
# by default...
Index: src/sys/arch/pmax/stand/bootxx_ffs/Makefile
diff -u src/sys/arch/pmax/stand/bootxx_ffs/Makefile:1.2 src/sys/arch/pmax/stand/bootxx_ffs/Makefile:1.3
--- src/sys/arch/pmax/stand/bootxx_ffs/Makefile:1.2 Sat Feb 1 23:58:48 2003
+++ src/sys/arch/pmax/stand/bootxx_ffs/Makefile Tue Apr 21 16:08:39 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:48 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/21 16:08:39 tsutsui Exp $
PRIMARY_PROG= bootxx_ffs
-CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=ufs \
- -DBOOTXX_FS_NAME='"FFS"'
+CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=ffsv1 \
+ -DBOOTXX_FS_NAME='"FFSv1"'
# Use small daddr_t to avoid code bloat
CPPFLAGS+= -D__daddr_t=int32_t
Index: src/sys/arch/pmax/stand/common/conf.c
diff -u src/sys/arch/pmax/stand/common/conf.c:1.24 src/sys/arch/pmax/stand/common/conf.c:1.25
--- src/sys/arch/pmax/stand/common/conf.c:1.24 Sun Dec 11 12:18:39 2005
+++ src/sys/arch/pmax/stand/common/conf.c Tue Apr 21 16:08:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.24 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: conf.c,v 1.25 2009/04/21 16:08:40 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -81,7 +81,8 @@
#ifndef LIBSA_SINGLE_FILESYSTEM
#ifdef LIBSA_NO_FS_CLOSE
-#define ufs_close 0
+#define ffsv1_close 0
+#define ffsv2_close 0
#define lfsv1_close 0
#define lfsv2_close 0
#define cd9660_close 0
@@ -89,7 +90,8 @@
#define nfs_close 0
#endif
#ifdef LIBSA_NO_FS_WRITE
-#define ufs_write 0
+#define ffsv1_write 0
+#define ffsv2_write 0
#define lfsv1_write 0
#define lfsv2_write 0
#define cd9660_write 0
@@ -98,7 +100,8 @@
#endif
struct fs_ops file_system[] = {
- FS_OPS(ufs),
+ FS_OPS(ffsv1),
+ FS_OPS(ffsv2),
FS_OPS(lfsv1),
FS_OPS(lfsv2),
FS_OPS(cd9660),
Added files:
Index: src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile
diff -u /dev/null src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile:1.1
--- /dev/null Tue Apr 21 16:08:40 2009
+++ src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile Tue Apr 21 16:08:39 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/04/21 16:08:39 tsutsui Exp $
+
+PRIMARY_PROG= bootxx_ffsv2
+CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=ffsv2 \
+ -DBOOTXX_FS_NAME='"FFSv2"'
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+= -D__daddr_t=int32_t
+
+PRIMARY_MAX_LOAD!= expr 8192 - 512
+
+.include "../Makefile.booters"
