[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-354-g89ca9b6

[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  89ca9b6f4842c5ccbef5e6315e86e7bcc6077530 (commit)
      from  9764d74f32ee8f4570affc4285bae96187f46fcf (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 89ca9b6f4842c5ccbef5e6315e86e7bcc6077530
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Aug 6 10:59:26 2013 +0200

    [UBOOT] apf27: update to use external environment scripts.

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2013.04.h   |   96 ++++++--------------
 ...-add-support-for-the-armadeus-APF27-board.patch |   39 ++-------
 ...pf27-Add-FPGA-support-for-the-apf27-board.patch |   50 +++--------
 3 files changed, 46 insertions(+), 139 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index 416a750..d0dce93 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -8,8 +8,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"3.3"
-#define CONFIG_IDENT_STRING	" apf27 patch 3.9"
+#define CONFIG_ENV_VERSION	10
+#define CONFIG_IDENT_STRING	" apf27 patch 3.10"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -131,6 +131,7 @@
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
 #define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
 #define	CONFIG_FIRMWARE_OFFSET		0x00200000
+#define	CONFIG_FIRMWARE_SIZE		0x00080000	/* 512kB  */
 #define	CONFIG_KERNEL_OFFSET		0x00300000
 #define	CONFIG_ROOTFS_OFFSET		0x00800000
 
@@ -161,6 +162,9 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER			/* enable the "hush" shell */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* secondary prompt string */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT			"run check_flash check_env;"
+
 
 /*
  * Boot Linux
@@ -191,51 +195,33 @@
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"env_version="		CONFIG_ENV_VERSION			"\0" \
+	"env_version="		__stringify(CONFIG_ENV_VERSION)		"\0" \
 	"consoledev="		__stringify(ACFG_CONSOLE_DEV)		"\0" \
 	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
 	"partition=nand0,6\0"						\
 	"u-boot_addr="		__stringify(ACFG_MONITOR_OFFSET)	"\0" \
 	"env_addr="		__stringify(CONFIG_ENV_OFFSET)		"\0" \
 	"firmware_addr="	__stringify(CONFIG_FIRMWARE_OFFSET)	"\0" \
+	"firmware_size="	__stringify(CONFIG_FIRMWARE_SIZE)	"\0" \
 	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)	"\0" \
 	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)	"\0" \
+	"cpu_name=imx27"						"\0" \
 	"board_name="		__stringify(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} "			\
-		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
-	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
-	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
-		"${hostname}:eth0:off \0"				\
-	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; 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} ${extrabootargs};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} ${extrabootargs}; 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"							\
-	"firmware_autoload=0\0"						\
+	"check_env=if test -n ${flash_env_version}; "			\
+		"then env default env_version; "			\
+		"else env set flash_env_version ${env_version}; env save; "\
+		"fi; "							\
+		"if itest ${flash_env_version} < ${env_version}; then " \
+			"echo \"*** Warning - Environment version"	\
+			" change suggests: run flash_reset_env; reset\"; "\
+			"env default flash_reset_env; "\
+		"fi; \0"						\
+	"check_flash=nand lock; nand unlock ${env_addr}; \0"	\
+	"flash_reset_env=env default -f -a; saveenv; run update_env;"	\
+		"echo Flash environment variables erased!\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-nand.bin\0"				\
 	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
 		"nand erase.part u-boot;"		\
 		"if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
@@ -243,38 +229,12 @@
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"flash_firmware=nand erase.part firmware;"			\
-	"if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};"\
-			"then echo Flashing of Firmware succeed;"	\
-			"else echo Flashing of Firmware failed;"	\
-		"fi\0"							\
-	"flash_kernel=nand erase.part kernel;"				\
-		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
-			"then echo Flashing of kernel succeed;"		\
-			"else echo Flashing of kernel failed;"		\
-		"fi\0"							\
-	"flash_rootfs=nand erase.part rootfs;"	\
-		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
-			"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 -a; 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"		\
+	"download_env=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-env.txt\0"				\
+	"flash_env=env import -t ${loadaddr}; env save; \0"		\
+	"update_env=run download_env flash_env\0"			\
+	"update_all=run update_env update_uboot\0"			\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
 
 /*
diff --git a/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch b/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
index b99faaf..e39cb12 100644
--- a/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
+++ b/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
@@ -96,7 +96,7 @@ new file mode 100644
 index 0000000..fce3325
 --- /dev/null
 +++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,356 @@
+@@ -0,0 +1,329 @@
 +/*
 + * Copyright (C) 2007 Sascha Hauer, Pengutronix
 + * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -408,38 +408,11 @@ index 0000000..fce3325
 + */
 +int misc_init_r(void)
 +{
-+	char *s;
-+	u_char *firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR +
-+					      CONFIG_SYS_MONITOR_LEN);
-+	size_t size	= 0;
-+	size_t offset	= -1;
-+#if defined(CONFIG_FPGA)
-+	char *autoload = getenv("firmware_autoload");
-+#endif
-+	u8 pnum;
-+	struct mtd_device *dev;
-+	struct part_info *part;
-+
-+	/* detect compatibility issue of environment version */
-+	s = getenv("env_version");
-+	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+		char *const vars[] = {"flash_reset_env"};
-+		printf("*** Warning - Environment version change suggests: ");
-+		printf("run flash_reset_env; reset\n");
-+		set_default_vars(1, vars);
-+	}
-+
-+	/* Unlock whole flash but U-Boot */
-+	if (mtdparts_init() == 0) {
-+		if (find_dev_and_part("u-boot",
-+				      &dev, &pnum, &part) == 0) {
-+			offset = part->size;
-+		}
-+	}
-+
-+	if (nand_unlock(&nand_info[0], offset, nand_info[0].size - offset, 0))
-+		printf("NAND flash lock/unlocked failed\n");
-+
++	/* create or delete environment variable if CTRL-C is pressed or not.*/
++	if (ctrlc())
++		setenv ("had_ctrlc", "1");
++	else
++		setenv ("had_ctrlc", "");
 +
 +	return 0;
 +}
diff --git a/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch b/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
index 9bc8a89..0948b61 100644
--- a/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
+++ b/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
@@ -37,36 +37,23 @@ index fce3325..951a5e3 100644
  
  DECLARE_GLOBAL_DATA_PTR;
  
-@@ -321,6 +322,23 @@ int misc_init_r(void)
- 	struct mtd_device *dev;
- 	struct part_info *part;
+@@ -321,6 +322,10 @@ int misc_init_r(void)
+ 	else
+ 		setenv ("had_ctrlc", "");
  
 +#if defined(CONFIG_FPGA)
-+	/* init and download fpga */
-+	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if (mtdparts_init() == 0)
-+			if (find_dev_and_part("firmware",
-+					      &dev, &pnum, &part) == 0) {
-+				size = part->size;
-+				if (nand_read_skip_bad(&nand_info[0],
-+						       part->offset, &size,
-+						       NULL, part->size,
-+						       firmware_buffer))
-+					size = 0;
-+			}
-+	}
-+	APF27_init_fpga(firmware_buffer, size);
++	APF27_init_fpga();
 +#endif
 +
- 	/* detect compatibility issue of environment version */
- 	s = getenv("env_version");
- 	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
+ 	return 0;
+ }
+ 
 diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c
 new file mode 100644
 index 0000000..47f4ffc
 --- /dev/null
 +++ b/board/armadeus/apf27/fpga.c
-@@ -0,0 +1,250 @@
+@@ -0,0 +1,237 @@
 +/*
 + * (C) Copyright 2002-2012
 + * Eric Jarrige <eri...@ar...>
@@ -289,11 +276,9 @@ index 0000000..47f4ffc
 +/*
 + * Initialize the fpga.  Return 1 on success, 0 on failure.
 + */
-+int APF27_init_fpga(u_char *buffer, size_t size)
++void APF27_init_fpga(void)
 +{
-+	char *autoload = getenv("firmware_autoload");
-+
-+	int i, lout = 0;
++	int i;
 +
 +	apf27_fpga_setup();
 +
@@ -304,18 +289,7 @@ index 0000000..47f4ffc
 +		fpga_add(fpga_xilinx, &fpga[i]);
 +	}
 +
-+	if ((size >= fpga[0].size) && (autoload) &&
-+	    (0 == strcmp(autoload, "1"))) {
-+		if (ctrlc()) {
-+			printf("Firmware download stopped!\n");
-+		} else if (FPGA_SUCCESS != fpga_load(0, (void *)buffer, size)) {
-+			printf("Firmware download failed!\n");
-+		} else {
-+			printf("Firmware successfully programmed\n");
-+			lout = 1;
-+		}
-+	}
-+	return lout;
++	return;
 +}
 diff --git a/board/armadeus/apf27/fpga.h b/board/armadeus/apf27/fpga.h
 new file mode 100644
@@ -348,7 +322,7 @@ index 0000000..e30dd11
 + * MA 02111-1307 USA
 + *
 + */
-+extern int APF27_init_fpga(u_char *buffer, size_t size);
++extern void APF27_init_fpga(void);
 +
 +extern int fpga_pre_fn(int cookie);
 +extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);


hooks/post-receive
-- 
armadeus