[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-508-g7c70b91

[Gwenhael Goavec-M. <gwe...@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  7c70b91863f01e1f9a553cbfdbcb6dfd29242c12 (commit)
       via  506dd82f8739c7ffd2380ad48a15b2bbfe66d8e3 (commit)
      from  7dd62cb34d2a8b02ecea698f1b46e1fb2a5c1b37 (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 7c70b91863f01e1f9a553cbfdbcb6dfd29242c12
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Thu Dec 11 21:15:47 2014 +0100

    [BUILDROOT] apf27mainline : use uboot config for mainline kernel

commit 506dd82f8739c7ffd2380ad48a15b2bbfe66d8e3
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date:   Thu Dec 11 21:14:54 2014 +0100

    [UBOOT] apf27: add uboot config dedicated for mainline kernel (ie console and dtb)

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

Summary of changes:
 buildroot/configs/apf27mainline_defconfig          |    2 +-
 ...ot-2014.04.h => apf27mainline-u-boot-2014.04.h} |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 copy buildroot/target/device/armadeus/apf27/{apf27-u-boot-2014.04.h => apf27mainline-u-boot-2014.04.h} (99%)

diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index d6f8df1..993f4b2 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -88,7 +88,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2014.04.tar.bz2"
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.04"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.04.h"
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2014.04.h"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
 BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h b/buildroot/target/device/armadeus/apf27/apf27mainline-u-boot-2014.04.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
copy to buildroot/target/device/armadeus/apf27/apf27mainline-u-boot-2014.04.h
index 913fce3..3b915c1 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27mainline-u-boot-2014.04.h
@@ -178,7 +178,7 @@
 			__stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
 			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
-#define ACFG_CONSOLE_DEV	ttySMX0
+#define ACFG_CONSOLE_DEV	ttymxc0
 #define CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CONFIG_SYS_AUTOLOAD	"no"
 /*
@@ -202,6 +202,7 @@
 	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)	"\0" \
 	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)	"\0" \
 	"board_name="		__stringify(CONFIG_BOARD_NAME)		"\0" \
+	"fdt_addr_r=A1000000\0" \
 	"kernel_addr_r=A0000000\0" \
 	"check_env=if test -n ${flash_env_version}; "			\
 		"then env default env_version; "			\


hooks/post-receive
-- 
armadeus