[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-574-g372197f

[Sébastien S. <ss...@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  372197f597a4d2affbb2d8539c69cc88cafc7e96 (commit)
      from  b62985620bc908511dc5ed26b0c2bbd851ec2601 (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 372197f597a4d2affbb2d8539c69cc88cafc7e96
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Feb 10 11:40:59 2015 +0100

    [UBOOT] 2014.07: apf6: don't use env vars in bootstrap

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

Summary of changes:
 .../506-apf6-in_bootstrap_dont_use_env_vars.patch  |   30 ++++++++++++++++++++
 software/uboot_recover/apf6-u-boot.img             |  Bin 372844 -> 366848 bytes
 software/uboot_recover/apf6-u-boot.spl             |  Bin 39936 -> 39936 bytes
 software/uboot_recover/apf6_recovery.py            |    2 -
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 patches/u-boot/2014.07/506-apf6-in_bootstrap_dont_use_env_vars.patch

diff --git a/patches/u-boot/2014.07/506-apf6-in_bootstrap_dont_use_env_vars.patch b/patches/u-boot/2014.07/506-apf6-in_bootstrap_dont_use_env_vars.patch
new file mode 100644
index 0000000..6268851
--- /dev/null
+++ b/patches/u-boot/2014.07/506-apf6-in_bootstrap_dont_use_env_vars.patch
@@ -0,0 +1,30 @@
+Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+===================================================================
+--- uboot-2014.07.orig/board/armadeus/apf6/apf6.c
++++ uboot-2014.07/board/armadeus/apf6/apf6.c
+@@ -18,6 +18,7 @@
+ #include <asm/imx-common/video.h>
+ #include <asm/io.h>
+ #include <common.h>
++#include <environment.h>
+ #include <fsl_esdhc.h>
+ #include <linux/ctype.h>
+ #include <miiphy.h>
+@@ -327,9 +328,17 @@ int board_late_init(void)
+ 	u_char *firmware_buffer =
+ 	    (u_char *) (CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
+ 	size_t size = 0;
++	struct src *psrc = (struct src *)SRC_BASE_ADDR;
++	unsigned reg = readl(&psrc->sbmr2);
+ 
+ 	SETUP_IOMUX_PADS(usb_pads);
+ 
++	/* In bootstrap don't use the the env vars */
++	if (((reg & 0x3000000) >> 24) == 0x1) {
++		set_default_env(NULL);
++		setenv("preboot", "");
++	}
++
+ 	if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
+ 		setenv("fdt_file", "imx6q-apf6dev.dtb");
+ 	else if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO))
diff --git a/software/uboot_recover/apf6-u-boot.img b/software/uboot_recover/apf6-u-boot.img
index a1fd604..8f10bcc 100644
Binary files a/software/uboot_recover/apf6-u-boot.img and b/software/uboot_recover/apf6-u-boot.img differ
diff --git a/software/uboot_recover/apf6-u-boot.spl b/software/uboot_recover/apf6-u-boot.spl
index 4a72baf..bb29280 100644
Binary files a/software/uboot_recover/apf6-u-boot.spl and b/software/uboot_recover/apf6-u-boot.spl differ
diff --git a/software/uboot_recover/apf6_recovery.py b/software/uboot_recover/apf6_recovery.py
index 4db47fc..bcdc6ee 100644
--- a/software/uboot_recover/apf6_recovery.py
+++ b/software/uboot_recover/apf6_recovery.py
@@ -133,8 +133,6 @@ if __name__ == "__main__":
 
         uboot.waitForPrompt()
 
-        uboot.resetEnv(False)
-
         uboot.startYModem()
         subprocess.check_call(SERIAL_DOWNLOAD_APP + " -k " + U_BOOT_SPL + " > " + port + " < " + port,  shell=True)
         uboot.waitForPrompt()


hooks/post-receive
-- 
armadeus