[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-369-gee6dedf

[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  ee6dedf7bc30460b58eccb930ad62721a09a138a (commit)
      from  d79da81bcafc3808681495b4369acae09f07f940 (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 ee6dedf7bc30460b58eccb930ad62721a09a138a
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 9 18:10:12 2013 +0200

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

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2013.04.h   |  106 ++++++--------------
 .../target/device/armadeus/u-boot-env-2013.04.txt  |    2 +-
 patches/u-boot/2013.04/401-apf51.patch             |   73 ++------------
 3 files changed, 42 insertions(+), 139 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index 31f7aa5..35717c5 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -8,8 +8,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"1.5"
-#define CONFIG_IDENT_STRING	" apf51 patch 2.1"
+#define CONFIG_ENV_VERSION	10
+#define CONFIG_IDENT_STRING	" apf51 patch 2.2"
 #define CONFIG_BOARD_NAME apf51
 
 /*
@@ -24,8 +24,6 @@
  */
 #define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h> */
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MISC_INIT_R
-#define CONFIG_BOARD_LATE_INIT
 
 /*
  * Board display option
@@ -136,8 +134,9 @@
 #define CONFIG_ENV_RANGE		0x00080000	/* 512kB */
 #define	CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
-#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
+#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 128kB */
 #define	CONFIG_FIRMWARE_OFFSET		0x00200000
+#define	CONFIG_FIRMWARE_SIZE		0x00100000
 #define	CONFIG_KERNEL_OFFSET		0x00400000
 #define	CONFIG_ROOTFS_OFFSET		0x00C00000
 
@@ -169,6 +168,8 @@
 #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
@@ -200,47 +201,34 @@
  * 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,7\0"						\
 	"uboot_addr="		__stringify(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
 	"env_addr="		__stringify(CONFIG_ENV_OFFSET)		"\0" \
-	"firmware_addr="	__stringify(CONFIG_FIRMWARE_OFFSET)		"\0" \
-	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)		"\0" \
-	"rootfs_addr="		__stringify(CONFIG_ROOTFS_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=imx51"						"\0" \
 	"board_name="		__stringify(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} "			\
-		"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"		\
-	"firmware_autoload=0\0"						\
+	"preboot=run check_flash check_env; \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-with-nand-spl.imx\0"				\
 	"flash_uboot=nand unlock ${uboot_addr} ;"			\
 		"nand erase.part u-boot;"				\
 		"if nand write.trimffs ${fileaddr} ${uboot_addr} ${filesize};"\
@@ -248,40 +236,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-with-nand-spl.imx\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"		\
+	"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=echo unlock_reg not needed anymore\0"
 
 /*
@@ -367,7 +327,7 @@
 #define CONFIG_FPGA_COUNT		1
 #define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT		20000	/* 20 ms */
+#define CONFIG_SYS_FPGA_WAIT		1000	/* 1 s */
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_CHECK_CTRLC
 #define CONFIG_SYS_FPGA_CHECK_ERROR
diff --git a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
index db77f1c..0290499 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -3,7 +3,7 @@
 download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
 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
 update_firmware=run download_firmware flash_firmware
-load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga loadb 0 ${loadaddr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed! fi;
+load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga load 0 ${loadaddr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed!; fi;
 checknload_firmware=if test -n ${firmware_autoload}; then if test -n ${had_ctrlc}; then echo Firmware download stopped; else run load_firmware; fi; else exit; fi;
 
 # DTB
diff --git a/patches/u-boot/2013.04/401-apf51.patch b/patches/u-boot/2013.04/401-apf51.patch
index 66a5455..4f72a79 100644
--- a/patches/u-boot/2013.04/401-apf51.patch
+++ b/patches/u-boot/2013.04/401-apf51.patch
@@ -67,7 +67,7 @@ new file mode 100644
 index 0000000..8ff1381
 --- /dev/null
 +++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,1204 @@
+@@ -0,0 +1,1157 @@
 +/*
 + * (C) Copyright 2010-2013 Eric Jarrige, Armadeus Project
 + *
@@ -986,62 +986,15 @@ index 0000000..8ff1381
 +	/* address of boot parameters */
 +	gd->bd->bi_boot_params = CSD0_BASE_ADDR + 0x100;
 +
-+	return 0;
-+}
-+
-+/*
-+ * Miscellaneous intialization
-+ */
-+int misc_init_r(void)
-+{
 +#ifdef CONFIG_I2C_MXC
 +	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 +#endif
-+	return 0;
-+}
-+
-+#ifdef CONFIG_BOARD_LATE_INIT
-+int board_late_init(void)
-+{
-+	char *s;
-+	u_char *firmware_buffer =
-+	    (u_char *) (CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
-+	size_t size = 0;
-+	char *autoload = getenv("firmware_autoload");
-+	u8 pnum;
-+	struct mtd_device *dev;
-+	struct part_info *part;
 +
 +#if defined(CONFIG_FPGA)
-+	/* init and download fpga */
-+	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if ((mtdparts_init() == 0) && (find_dev_and_part("firmware",
-+			&dev, &pnum, &part) == 0)) {
-+			size = part->size;
-+			if (nand_read_skip_bad(&nand_info[0], part->offset,
-+				&size, NULL, nand_info[0].size, firmware_buffer))
-+				size = 0;
-+		}
-+		if (ctrlc()) {
-+			printf("Firmware download stopped!\n");
-+			size = 0;
-+		}
-+	}
-+	APF51_init_fpga(firmware_buffer, size);
++	APF51_init_fpga();
 +#endif
-+
-+	/* 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: "
-+		       "run flash_reset_env; reset\n");
-+		set_default_vars(1, vars);
-+	}
-+
 +	return 0;
 +}
-+#endif
 +
 +int checkboard(void)
 +{
@@ -1277,7 +1230,7 @@ new file mode 100644
 index 0000000..665928e
 --- /dev/null
 +++ b/board/armadeus/apf51/fpga.c
-@@ -0,0 +1,266 @@
+@@ -0,0 +1,256 @@
 +/*
 + * (C) Copyright 2002-2010
 + * Nicolas Colombain <nic...@ar...>
@@ -1494,7 +1447,7 @@ index 0000000..665928e
 +
 +int fpga_abort_fn(int cookie)
 +{
-+	return cookie;
++	return fpga_post_fn(cookie);
 +}
 +
 +int fpga_busy_fn(int cookie)
@@ -1519,9 +1472,9 @@ index 0000000..665928e
 +/*
 + * Initialize the fpga.  Return 1 on success, 0 on failure.
 + */
-+int APF51_init_fpga(u_char *buffer, size_t size)
++int APF51_init_fpga(void)
 +{
-+	int i, lout = 0;
++	int i;
 +
 +	fpga_init();
 +
@@ -1530,17 +1483,7 @@ index 0000000..665928e
 +		fpga_add(fpga_xilinx, &fpga[i]);
 +	}
 +
-+	if ((size >= fpga[0].size)) {
-+		printf("Loading FPGA...");
-+		if (FPGA_SUCCESS != fpga_load(0, (void *)buffer, size)) {
-+			lout = 1;
-+			printf("firmware download failed!\n");
-+		} else {
-+			printf("firmware successfully programmed\n");
-+		}
-+	}
-+
-+	return lout;
++	return 0;
 +}
 +
 +#endif /* CONFIG_FPGA */
@@ -1575,7 +1518,7 @@ index 0000000..f22f4d8
 + * MA 02111-1307 USA
 + *
 + */
-+extern int APF51_init_fpga(u_char *buffer, size_t size);
++extern int APF51_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