[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-404-gcb7bad5

[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  cb7bad506bb64b527cab0a0737e82945d10b02a1 (commit)
      from  99062345837c404e0cec6ad96c3f3153a3a6869a (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 cb7bad506bb64b527cab0a0737e82945d10b02a1
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Jun 20 19:43:04 2012 +0200

    [UBOOT] apf51: update mmc and nfs boot script - support linux DTB - Note: APF51 does not read the kernel from the SD

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2012.04.h   |   43 ++++++++++++++++---
 1 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index dbb84d8..ec6515b 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -24,8 +24,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"1.0"
-#define CONFIG_IDENT_STRING	" apf51 patch 1.4"
+#define CONFIG_ENV_VERSION 	"1.1"
+#define CONFIG_IDENT_STRING	" apf51 patch 1.5"
 #define CONFIG_BOARD_NAME	apf51
 
 /*
@@ -91,8 +91,10 @@
 #define CONFIG_CMD_CACHE	/* icache, dcache               */
 #define CONFIG_CMD_DHCP		/* DHCP Support                 */
 /*#define CONFIG_CMD_DNS*/
+/*#define CONFIG_CMD_EXT2*/
 /*#define CONFIG_CMD_I2C*/	/* I2C serial bus support       */
 #define CONFIG_CMD_IIM		/* imx iim fuse                 */
+/*#define CONFIG_CMD_MMC*/
 #define CONFIG_CMD_MTDPARTS	/* MTD partition support        */
 #define CONFIG_CMD_NAND		/* NAND support                 */
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -213,6 +215,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=90800000\0" \
 	"addnfsargs=setenv bootargs ${bootargs} "			\
 		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
 	"addubifsargs=setenv bootargs ${bootargs} "			\
@@ -223,14 +226,24 @@
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
 		"${hostname}:eth0:off\0"				\
 	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts}; run addnfsargs addipargs; setenv autostart yes;" \
-		"nboot 90800000 0 ${kernel_addr}\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 90800000 0 ${kernel_addr}\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 90800000 0 ${kernel_addr}\0"			\
+		"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"		\
 	"firmware_autoload=0\0"						\
 	"flash_uboot=nand unlock ${uboot_addr} ;"			\
 		"nand erase.part u-boot;"				\
@@ -255,14 +268,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} imx51-${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"
@@ -386,6 +406,15 @@
 /*
  * SD/MMC
  */
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_FSL_ESDHC
+#define CONFIG_SYS_FSL_ESDHC_ADDR	0
+#define CONFIG_SYS_FSL_ESDHC_NUM	1
+
+#define CONFIG_MMC
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#endif
 
 /*
  * RTC


hooks/post-receive
-- 
armadeus