diff options
| author | gber <gber@FreeBSD.org> | 2012-05-17 10:11:18 +0000 |
|---|---|---|
| committer | gber <gber@FreeBSD.org> | 2012-05-17 10:11:18 +0000 |
| commit | 6f7c7353004e2ff9709b326a4008ce8ea63d9270 (patch) | |
| tree | a325137a898341311de8641f7212e28b7d87950e /sys/boot/arm | |
| parent | 661b9d94414ea6d11d5b7960aef1f172975ce52b (diff) | |
| download | FreeBSD-src-6f7c7353004e2ff9709b326a4008ce8ea63d9270.zip FreeBSD-src-6f7c7353004e2ff9709b326a4008ce8ea63d9270.tar.gz | |
Import work done under project/nand (@235533) into head.
The NAND Flash environment consists of several distinct components:
- NAND framework (drivers harness for NAND controllers and NAND chips)
- NAND simulator (NANDsim)
- NAND file system (NAND FS)
- Companion tools and utilities
- Documentation (manual pages)
This work is still experimental. Please use with caution.
Obtained from: Semihalf
Supported by: FreeBSD Foundation, Juniper Networks
Diffstat (limited to 'sys/boot/arm')
| -rw-r--r-- | sys/boot/arm/uboot/Makefile | 8 | ||||
| -rw-r--r-- | sys/boot/arm/uboot/conf.c | 3 | ||||
| -rw-r--r-- | sys/boot/arm/uboot/version | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile index 906fc87..b69d38c 100644 --- a/sys/boot/arm/uboot/Makefile +++ b/sys/boot/arm/uboot/Makefile @@ -15,6 +15,11 @@ LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no LOADER_EXT2FS_SUPPORT?= no +.if ${MK_NAND} != "no" +LOADER_NANDFS_SUPPORT?= yes +.else +LOADER_NANDFS_SUPPORT?= no +.endif LOADER_NET_SUPPORT?= yes LOADER_NFS_SUPPORT?= yes LOADER_TFTP_SUPPORT?= no @@ -38,6 +43,9 @@ CFLAGS+= -DLOADER_CD9660_SUPPORT .if ${LOADER_EXT2FS_SUPPORT} == "yes" CFLAGS+= -DLOADER_EXT2FS_SUPPORT .endif +.if ${LOADER_NANDFS_SUPPORT} == "yes" +CFLAGS+= -DLOADER_NANDFS_SUPPORT +.endif .if ${LOADER_GZIP_SUPPORT} == "yes" CFLAGS+= -DLOADER_GZIP_SUPPORT .endif diff --git a/sys/boot/arm/uboot/conf.c b/sys/boot/arm/uboot/conf.c index b797565..03dc641 100644 --- a/sys/boot/arm/uboot/conf.c +++ b/sys/boot/arm/uboot/conf.c @@ -56,6 +56,9 @@ struct fs_ops *file_system[] = { #if defined(LOADER_EXT2FS_SUPPORT) &ext2fs_fsops, #endif +#if defined(LOADER_NANDFS_SUPPORT) + &nandfs_fsops, +#endif #if defined(LOADER_NFS_SUPPORT) &nfs_fsops, #endif diff --git a/sys/boot/arm/uboot/version b/sys/boot/arm/uboot/version index 38c7eb6..486c412 100644 --- a/sys/boot/arm/uboot/version +++ b/sys/boot/arm/uboot/version @@ -3,6 +3,7 @@ $FreeBSD$ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.2: Extended with NAND FS support. 1.1: Flattened Device Tree blob support. 1.0: Added storage support. Booting from HDD, USB, etc. is now possible. 0.5: Initial U-Boot/arm version (netbooting only). |
