[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-165-g1d53afe
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2016-11-21 09:49:49
|
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, buildroot-update has been updated
via 1d53afe97730d7d9be4d9ae27ea8cbb8ea9f1d3b (commit)
via 8fbe0508297a3bd1cd57f83ee518b6964ab38eb8 (commit)
from 60e1cb3d98f105e6011a5524dc4d4a29a180c7d4 (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 1d53afe97730d7d9be4d9ae27ea8cbb8ea9f1d3b
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Nov 21 10:51:15 2016 +0100
[BSP] opos6ul: don't create opos6ul-linux.bin -> zImage symlink
U-Boot doesn't like it... so rename zImage to opos6ul-linux.bin
commit 8fbe0508297a3bd1cd57f83ee518b6964ab38eb8
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Nov 21 09:59:59 2016 +0100
[LINUX] opos6ul and opos6ul_recovery: bump to 4.8.9
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ul_recovery_defconfig | 2 +-
...nux-4.8.6.config => opos6ul-linux-4.8.9.config} | 0
.../target/device/armadeus/rootfs/post_build.sh | 8 +++++++-
patches/linux/{4.8.6 => 4.8.9} | 0
5 files changed, 9 insertions(+), 3 deletions(-)
rename buildroot/target/device/armadeus/opos6ul/{opos6ul-linux-4.8.6.config => opos6ul-linux-4.8.9.config} (100%)
rename patches/linux/{4.8.6 => 4.8.9} (100%)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 48c6d7b..c799aa5 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.9"
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/configs/opos6ul_recovery_defconfig b/buildroot/configs/opos6ul_recovery_defconfig
index dd94aef..160c9c5 100644
--- a/buildroot/configs/opos6ul_recovery_defconfig
+++ b/buildroot/configs/opos6ul_recovery_defconfig
@@ -23,7 +23,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.9"
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/opos6ul/opos6ul-linux-4.8.6.config b/buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.9.config
similarity index 100%
rename from buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.6.config
rename to buildroot/target/device/armadeus/opos6ul/opos6ul-linux-4.8.9.config
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index c59a811..ed0a392 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -21,7 +21,13 @@ symlink_image()
mkdir -p $1/boot
ln -sfn . $1/boot/dtbs # to keep compat with pre-6.0 APF6 U-Boots
symlink_image $1/boot uImage $2-linux.bin
-symlink_image $1/boot zImage $2-linux.bin
+if [ "$3" != "imx6ul" ]; then
+ symlink_image $1/boot zImage $2-linux.bin
+else
+ if [ -f "$1/boot/zImage" ]; then
+ mv $1/boot/zImage $1/boot/$2-linux.bin
+ fi
+fi
# Not using $2 because it can be changed for customers' BSP
if [ "$3" != "imxl" ]; then
diff --git a/patches/linux/4.8.6 b/patches/linux/4.8.9
similarity index 100%
rename from patches/linux/4.8.6
rename to patches/linux/4.8.9
hooks/post-receive
--
armadeus
|