Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add UFS2 support. Also bump version.

Browse Source
This commit is contained in:
tsutsui 2013-01-16 15:46:20 +00:00
parent ed929c1db1
commit c59be8f8b3
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/arch/luna68k/stand/boot/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.2 2013/01/13 14:10:55 tsutsui Exp $ */
/* $NetBSD: conf.c,v 1.3 2013/01/16 15:46:20 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@ -92,11 +92,16 @@ int n_netif_drivers = __arraycount(netif_drivers);
* Filesystem configuration
*/
#ifdef SUPPORT_DISK
struct fs_ops file_system_ufs[] = { FS_OPS(ufs) };
struct fs_ops file_system_disk[] = {
FS_OPS(ffsv1),
FS_OPS(ffsv2)
};
int nfsys_disk = __arraycount(file_system_disk);
#endif
#ifdef SUPPORT_ETHERNET
struct fs_ops file_system_nfs[] = { FS_OPS(nfs) };
#endif
struct fs_ops file_system[1];
#define MAX_NFSYS 5
struct fs_ops file_system[MAX_NFSYS];
int nfsys = 1; /* we always know which one we want */

9
sys/arch/luna68k/stand/boot/devopen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: devopen.c,v 1.2 2013/01/13 14:10:55 tsutsui Exp $ */
/* $NetBSD: devopen.c,v 1.3 2013/01/16 15:46:20 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@ -82,6 +82,7 @@ devopen(struct open_file *f, const char *fname, char **file)
int dev, unit, part;
int error;
struct devsw *dp;
int i;
if (make_device(fname, &dev, &unit, &part, file) != 0)
return ENXIO;
@ -100,11 +101,15 @@ devopen(struct open_file *f, const char *fname, char **file)
return error;
}
file_system[0] = file_system_ufs[0];
for (i = 0; i < nfsys_disk; i++)
file_system[i] = file_system_disk[i];
nfsys = nfsys_disk;
#ifdef SUPPORT_ETHERNET
if (strcmp(dp->dv_name, "le") == 0) {
/* XXX mixing local fs_ops on netboot could be troublesome */
file_system[0] = file_system_nfs[0];
nfsys = 1;
}
#endif

5
sys/arch/luna68k/stand/boot/samachdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: samachdep.h,v 1.5 2013/01/16 15:15:01 tsutsui Exp $ */
/* $NetBSD: samachdep.h,v 1.6 2013/01/16 15:46:20 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@ -222,7 +222,8 @@ do { \
} while (__N > 0); \
} while (/* CONSTCOND */ 0)
extern struct fs_ops file_system_ufs[];
extern struct fs_ops file_system_disk[];
extern int nfsys_disk;
extern struct fs_ops file_system_nfs[];
extern const char bootprog_name[], bootprog_rev[], bootprog_kernrev[];

3
sys/arch/luna68k/stand/boot/version
View File

@ -1,4 +1,4 @@
$NetBSD: version,v 1.3 2013/01/14 01:37:57 tsutsui Exp $
$NetBSD: version,v 1.4 2013/01/16 15:46:20 tsutsui Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@ -7,3 +7,4 @@ is taken as the current.
1.0: Initial revision, based on 4.4BSD-Lite2/luna68k and NetBSD/hp300
1.1: Add netboot support.
1.2: Add support for secondary SPC SCSI on LUNA-II.
1.3: Add UFS2 support.