[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-471-gd6ad559

[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  d6ad5595e425bd878cec0fd32aeee00863f1d455 (commit)
       via  73680b1cc7d95aea524b54ac8fefdbb697b79f5d (commit)
       via  ea584651310ac3ef3dc6401deedebad8597e28d6 (commit)
      from  8077633e2503b5663f44a449f4015fff5b62b3ae (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 d6ad5595e425bd878cec0fd32aeee00863f1d455
Author: Sébastien Szymanski <ss...@us...>
Date:   Tue Nov 4 10:19:11 2014 +0100

    [LINUX] apf51: fix linux 3.1{6,7,8} config files
    
    For 3.17 and 3.18, CONFIG_MACH_IMX51_DT has been renamed SOC_IMX51.
    For the three kernel, CONFIG_POWER_SUPPLY is now a boolean.

commit 73680b1cc7d95aea524b54ac8fefdbb697b79f5d
Author: Sébastien Szymanski <ss...@us...>
Date:   Tue Nov 4 09:55:22 2014 +0100

    [LINUX] 3.18: apf6: move to 3.18-rc3

commit ea584651310ac3ef3dc6401deedebad8597e28d6
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Nov 3 10:48:48 2014 +0100

    [BUILDROOT] apf6: Create apf6-u-boot.img symlink to u-boot.img image

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

Summary of changes:
 buildroot/configs/apf6_defconfig                   |    2 +-
 .../device/armadeus/apf51/apf51-linux-3.16.config  |    2 +-
 .../device/armadeus/apf51/apf51-linux-3.17.config  |    4 ++--
 .../device/armadeus/apf51/apf51-linux-3.18.config  |    4 ++--
 .../device/armadeus/rootfs/post_image_creation.sh  |    1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 0a638af..c072a98 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18-rc2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18-rc3"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
index bdf1419..b33ee57 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
@@ -129,7 +129,7 @@ CONFIG_SPI_IMX=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
 CONFIG_WM831X_BACKUP=m
 CONFIG_WM831X_POWER=m
 CONFIG_HWMON=m
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
index bdf1419..f0a64f0 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
@@ -20,7 +20,7 @@ CONFIG_BSD_DISKLABEL=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MXC=y
 CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
@@ -129,7 +129,7 @@ CONFIG_SPI_IMX=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
 CONFIG_WM831X_BACKUP=m
 CONFIG_WM831X_POWER=m
 CONFIG_HWMON=m
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
index bdf1419..f0a64f0 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
@@ -20,7 +20,7 @@ CONFIG_BSD_DISKLABEL=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MXC=y
 CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
@@ -129,7 +129,7 @@ CONFIG_SPI_IMX=y
 CONFIG_SPI_SPIDEV=m
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
 CONFIG_WM831X_BACKUP=m
 CONFIG_WM831X_POWER=m
 CONFIG_HWMON=m
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index b7195f2..265d044 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -38,6 +38,7 @@ if [ "$2" != "" ]; then
 
 	# APF6
 	symlink_image $1 SPL $2-u-boot.spl
+	symlink_image $1 u-boot.img $2-u-boot.img
 
 else
 	# Old BR compat


hooks/post-receive
-- 
armadeus