[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-403-g9906234

[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  99062345837c404e0cec6ad96c3f3153a3a6869a (commit)
      from  057d4d032272400ae74b517e33ad9fa8499d4f73 (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 99062345837c404e0cec6ad96c3f3153a3a6869a
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 00:53:41 2012 +0200

    [UBOOT] apf27: update mmc and nfs boot script - support linux DTB

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2012.04.h   |   45 ++++++++++++--------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index 6e9741a..ae4e989 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"3.0"
-#define CONFIG_IDENT_STRING	" apf27 patch 3.5"
+#define CONFIG_ENV_VERSION 	"3.1"
+#define CONFIG_IDENT_STRING	" apf27 patch 3.6"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -207,6 +207,7 @@
 	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
 	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
 	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
+	"kernel_addr_r=A0000000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
@@ -217,28 +218,29 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off \0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
-		"nboot kernel\0"					\
-	"nfsboot2=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
-		"setenv kernel_image ${board_name}-linux.bin;"		\
-		"nfs ${loadaddr} "					\
-			"${serverip}:${rootpath}/${kernel_image};"	\
-		"bootm\0"						\
+		"${mtdparts}; run addnfsargs addipargs;"		\
+		"nfs ${kernel_addr_r} "					\
+		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
-		"nboot kernel\0"					\
+		"${mtdparts};run addubifsargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"nboot ${kernel_addr_r} kernel;"			\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
 	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
-		"nboot kernel\0"					\
+		"${mtdparts}; run addmmcargs addipargs;"		\
+		"if test -n ${fdt_addr_r}  ; then "			\
+			"nand read ${fdt_addr_r} dtb; fi;"		\
+		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
+			" /boot/${board_name}-linux.bin;"		\
+		"bootm ${kernel_addr_r} - ${fdt_addr_r}\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 ${u-boot_addr} ;"			\
 		"nand erase.part u-boot;"		\
@@ -262,14 +264,21 @@
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
+	"flash_dtb=nand erase.part dtb;"				\
+		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
+			"then echo Flashing of rootfs succeed;"		\
+			"else echo Flashing of rootfs failed;"		\
+		"fi\0"							\
 	"flash_reset_env=env default -f; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
+	"download_dtb=tftpboot ${loadaddr} imx27-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"		\
+	"update_dtb=run download_dtb flash_dtb\0"		\
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\


hooks/post-receive
-- 
armadeus