[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-125-g2ca2fe3

[jorasse <jo...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  2ca2fe309f3c961499059ec738a1b67663ecbbe9 (commit)
       via  969dfa9286b44fee86c472b03fc8df0acb878ecd (commit)
      from  090090fd216b8f31d03964b986005ceeb41eccfc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2ca2fe309f3c961499059ec738a1b67663ecbbe9
Merge: 969dfa9 090090f
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Mar 13 15:35:03 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 969dfa9286b44fee86c472b03fc8df0acb878ecd
Author: Samuel MARTIN <s.m...@gm...>
Date:   Mon Mar 12 22:41:03 2012 +0100

    apf27-u-boot-1.3.4.h: add boot_nfs{, 2}_fallback_flash commands
    
    This patch adds 3 new u-boot commands:
    - nfsboot2: boot loading both kernel image and rootfs over NFS
    (whereas the nfsboot command loads the kernel from the flash memory);
    - boot_nfs{,2}_fallback_flash: run nfsboot/nfsboot2 if the NFS server
    is alive, otherwise run ubifsboot.
    
    Note that, running nfsboot or nfsboot2 may lead to an infinite pending
    state of the booting if a host responds on the server address, but no
    NFS server is running on it or the kernel image or/and the rootfs are
    missing at the expected location.
    
    Change since v1:
    - commands renaming according to Eric Jarrige's suggestion:
      boot_nfs{,2}_fallback_ubifs -> boot_nfs{,2}_fallback_flash
    - misc. command fixes
    
    Signed-off-by: Samuel MARTIN <s.m...@gm...>
    Signed-off-by: Eric Jarrige <eri...@ar...>

-----------------------------------------------------------------------

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-1.3.4.h     |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
index bfe6115..8b5caa1 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
@@ -160,6 +160,12 @@
 	"nfsboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addnfsargs addipargs; setenv autostart yes;"	\
 		"nboot.jffs2 A0000000 0 ${kernel_offset}\0"		\
+	"nfsboot2=setenv bootargs ${console} ${mtdparts};"		\
+		"run addnfsargs addipargs; setenv autostart yes;"	\
+		"setenv kernel_image ${board_name}-linux.bin;"		\
+		"nfs ${loadaddr} "					\
+			"${serverip}:${rootpath}/${kernel_image};"	\
+		"bootm\0"						\
 	"jffsboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addjffsargs addipargs; setenv autostart yes;"	\
 		"nboot.jffs2 A0000000 0 ${kernel_offset}\0"		\
@@ -169,6 +175,14 @@
 	"mmcboot=setenv bootargs ${console} ${mtdparts};"		\
 		"run addmmcargs addipargs; setenv autostart yes;"	\
 		"nboot.jffs2 A0000000 0 ${kernel_offset}\0"		\
+	"boot_nfs_fallback_flash=if ping ${serverip};"			\
+			"then echo Boot over NFS; run nfsboot;"		\
+			"else echo Boot from the board; run ubifsboot;"	\
+		"fi\0"							\
+	"boot_nfs2_fallback_flash=if ping ${serverip};"			\
+			"then echo Boot over NFS; run nfsboot2;"	\
+			"else echo Boot from the board; run ubifsboot;"	\
+		"fi\0"							\
 	"firmware_autoload=0\0"					\
 	"flash_uboot=nand unlock ${uboot_offset} ${uboot_len};"		\
 		"nand erase ${uboot_offset} ${uboot_len};"		\


hooks/post-receive
-- 
armadeus