From 2277395172e62789cc6f8468baae569f1db47f7d Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 28 May 2016 22:36:42 +0900 Subject: [PATCH] configs: zynq: revive BR2_LINUX_KERNEL_UIMAGE Commit 5c67cb1d0445 ("linux: use zImage by default on ARM") changed the default kernel image, but missed to update Zynq defconfigs. U-Boot on Zynq boards still loads uImage, so BR2_LINUX_KERNEL_UIMAGE should be defined to generate uImage. Signed-off-by: Masahiro Yamada Signed-off-by: Thomas Petazzoni --- configs/zynq_microzed_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zed_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index c73fae52ad..3faa3b836a 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -9,6 +9,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" +BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zed" diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index d1a46ca106..fff49d3925 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -10,6 +10,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2014.2.01" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" +BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zc706" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 1330be402a..0e2c8ff9d8 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -9,6 +9,7 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2015.1" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" +BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zed" -- 2.30.2