[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-402-g057d4d0

[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  057d4d032272400ae74b517e33ad9fa8499d4f73 (commit)
       via  c4138eba9023ad721e2f2d30bf0145ca41edbd4b (commit)
      from  045dc476880412445af1bee7a95fd17caf0249bf (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 057d4d032272400ae74b517e33ad9fa8499d4f73
Merge: c4138eb 045dc47
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 00:21:27 2012 +0200

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

commit c4138eba9023ad721e2f2d30bf0145ca41edbd4b
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 00:19:50 2012 +0200

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

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2012.04.h   |   41 ++++++++++++++-----
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index c58f980..c33f3a5 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -25,8 +25,8 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.0"
-#define CONFIG_IDENT_STRING	" apf28 patch 1.4"
+#define CONFIG_ENV_VERSION 	"1.1"
+#define CONFIG_IDENT_STRING	" apf28 patch 1.5"
 #define CONFIG_BOARD_NAME	apf28
 
 /*
@@ -236,6 +236,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=40000000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
@@ -245,15 +246,26 @@
 	"addipargs=setenv bootargs ${bootargs} "			\
 		"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"		\
-	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
-		"${mtdparts};run addubifsargs addipargs; setenv autostart yes;"\
-		"nboot kernel\0"		\
-	"mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
-		"${mtdparts}; run addmmcargs addipargs; setenv autostart yes;" \
-		"nboot kernel\0"		\
+	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
+		"${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;"		\
+		"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;"		\
+		"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"		\
 	"flash_uboot=if bcb nand.write ; then "				\
 		"nand erase ${u-boot_addr} ${u-boot_len} ; "		\
 		"nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
@@ -273,14 +285,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.sb\0"	\
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
 	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
+	"download_dtb=tftpboot ${loadaddr} imx28-${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=echo unlock_reg not needed anymore\0"


hooks/post-receive
-- 
armadeus