From owner-svn-src-projects@FreeBSD.ORG Tue May 15 08:22:18 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8A9C106566B; Tue, 15 May 2012 08:22:18 +0000 (UTC) (envelope-from gber@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C3D678FC17; Tue, 15 May 2012 08:22:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4F8MIvG075908; Tue, 15 May 2012 08:22:18 GMT (envelope-from gber@svn.freebsd.org) Received: (from gber@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4F8MI3p075902; Tue, 15 May 2012 08:22:18 GMT (envelope-from gber@svn.freebsd.org) Message-Id: <201205150822.q4F8MI3p075902@svn.freebsd.org> From: Grzegorz Bernacki Date: Tue, 15 May 2012 08:22:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235464 - in projects/nand/sys/boot: arm/uboot i386/loader X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2012 08:22:18 -0000 Author: gber Date: Tue May 15 08:22:18 2012 New Revision: 235464 URL: http://svn.freebsd.org/changeset/base/235464 Log: nandfs: Add support to boot loader. Obtained from: Semihalf Supported by: FreeBSD Foundation, Juniper Networks Modified: projects/nand/sys/boot/arm/uboot/Makefile projects/nand/sys/boot/arm/uboot/conf.c projects/nand/sys/boot/arm/uboot/version projects/nand/sys/boot/i386/loader/Makefile projects/nand/sys/boot/i386/loader/conf.c Modified: projects/nand/sys/boot/arm/uboot/Makefile ============================================================================== --- projects/nand/sys/boot/arm/uboot/Makefile Tue May 15 06:42:16 2012 (r235463) +++ projects/nand/sys/boot/arm/uboot/Makefile Tue May 15 08:22:18 2012 (r235464) @@ -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 Modified: projects/nand/sys/boot/arm/uboot/conf.c ============================================================================== --- projects/nand/sys/boot/arm/uboot/conf.c Tue May 15 06:42:16 2012 (r235463) +++ projects/nand/sys/boot/arm/uboot/conf.c Tue May 15 08:22:18 2012 (r235464) @@ -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 Modified: projects/nand/sys/boot/arm/uboot/version ============================================================================== --- projects/nand/sys/boot/arm/uboot/version Tue May 15 06:42:16 2012 (r235463) +++ projects/nand/sys/boot/arm/uboot/version Tue May 15 08:22:18 2012 (r235464) @@ -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). Modified: projects/nand/sys/boot/i386/loader/Makefile ============================================================================== --- projects/nand/sys/boot/i386/loader/Makefile Tue May 15 06:42:16 2012 (r235463) +++ projects/nand/sys/boot/i386/loader/Makefile Tue May 15 08:22:18 2012 (r235464) @@ -53,6 +53,9 @@ CFLAGS+= -DLOADER_GZIP_SUPPORT .if !defined(LOADER_NO_GPT_SUPPORT) CFLAGS+= -DLOADER_GPT_SUPPORT .endif +.if defined(LOADER_NANDFS_SUPPORT) +CFLAGS+= -DLOADER_NANDFS_SUPPORT +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common Modified: projects/nand/sys/boot/i386/loader/conf.c ============================================================================== --- projects/nand/sys/boot/i386/loader/conf.c Tue May 15 06:42:16 2012 (r235463) +++ projects/nand/sys/boot/i386/loader/conf.c Tue May 15 08:22:18 2012 (r235464) @@ -79,6 +79,9 @@ struct fs_ops *file_system[] = { &ext2fs_fsops, &dosfs_fsops, &cd9660_fsops, +#if defined(LOADER_NANDFS_SUPPORT) + &nandfs_fsops, +#endif &splitfs_fsops, #if defined(LOADER_ZFS_SUPPORT) &zfs_fsops,