[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-423-g1a8394b

[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  1a8394bd4400c9a59bffe2dd0f6c537dde95cd64 (commit)
      from  bfb457e55baa40cf308ad68b73fe9b2b458b5cb2 (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 1a8394bd4400c9a59bffe2dd0f6c537dde95cd64
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Sep 29 14:43:27 2014 +0200

    [UBOOT] 2014.07: apf6: seek uboot image in boot partition.

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

Summary of changes:
 .../device/armadeus/apf6/apf6-u-boot-2014.07.h     |    1 +
 ...4-apf6-seek_uboot_image_in_boot_partition.patch |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 patches/u-boot/2014.07/504-apf6-seek_uboot_image_in_boot_partition.patch

diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 9310e35..ca243f7 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -68,6 +68,7 @@
 #define CONFIG_SYS_TEXT_BASE		0x17800000
 
 /* MMC Configuration */
+#define CONFIG_SUPPORT_EMMC_BOOT
 #define CONFIG_FSL_ESDHC
 #define CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_USDHC_NUM	2
diff --git a/patches/u-boot/2014.07/504-apf6-seek_uboot_image_in_boot_partition.patch b/patches/u-boot/2014.07/504-apf6-seek_uboot_image_in_boot_partition.patch
new file mode 100644
index 0000000..d1e52c7
--- /dev/null
+++ b/patches/u-boot/2014.07/504-apf6-seek_uboot_image_in_boot_partition.patch
@@ -0,0 +1,18 @@
+Index: uboot-2014.07/arch/arm/imx-common/spl.c
+===================================================================
+--- uboot-2014.07.orig/arch/arm/imx-common/spl.c
++++ uboot-2014.07/arch/arm/imx-common/spl.c
+@@ -64,9 +64,12 @@ u32 spl_boot_device(void)
+ u32 spl_boot_mode(void)
+ {
+	switch (spl_boot_device()) {
+-	/* for MMC return either RAW or FAT mode */
+	case BOOT_DEVICE_MMC1:
+	case BOOT_DEVICE_MMC2:
++#ifdef CONFIG_SUPPORT_EMMC_BOOT
++		return MMCSD_MODE_EMMCBOOT;
++#endif
++
+ #ifdef CONFIG_SPL_FAT_SUPPORT
+		return MMCSD_MODE_FAT;
+ #else


hooks/post-receive
-- 
armadeus