aboutsummaryrefslogtreecommitdiff
path: root/linux/linux.mk
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle <arnout@mind.be>2017-04-10 18:05:11 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-04-12 21:42:52 +0200
commitee995b18190aaae11dd4e7b4390c65871c1a1e83 (patch)
treec6bb0ef0490d88698bf02f4f4ff560039673c3ba /linux/linux.mk
parent822b34cb3d8d675f85929b9c46b0c3fac3a361c4 (diff)
downloadbuildroot-ee995b18190aaae11dd4e7b4390c65871c1a1e83.tar.gz
buildroot-ee995b18190aaae11dd4e7b4390c65871c1a1e83.tar.bz2
linux: select BR2_PACKAGE_HOST_UBOOT_TOOLS instead of BR2_LINUX_KERNEL_UBOOT_IMAGE
A long time ago, the blind config option BR2_LINUX_KERNEL_UBOOT_IMAGE was introduced to be able to trigger the linux -> host-uboot-tools dependency. Back in those days, there was no user-configurable BR2_PACKAGE_HOST_UBOOT_TOOLS. Now, however, it is possible to select a custom kernel image name that needs uboot-tools, and manually enable BR2_PACKAGE_HOST_UBOOT_TOOLS. In this case, however, the linux -> host-uboot-tools is missed and the build is not reproducible. An example of such a situation is the upcoming CI40 defconfig. As a solution, remove BR2_LINUX_KERNEL_UBOOT_IMAGE entirely. Instead, just select BR2_PACKAGE_HOST_UBOOT_TOOLS and add the dependency if it is selected. Note that this may introduce a redundant dependency in case the user selected BR2_PACKAGE_HOST_UBOOT_TOOLS for some other reason (e.g. to be able to generate a U-Boot environment to include in the image, while the kernel is built as a zImage). However, the redundant dependency shouldn't hurt much. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Cc: Abhimanyu Vishwakarma <abhimanyu.v@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'linux/linux.mk')
-rw-r--r--linux/linux.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 7973677d05..e387c7dd44 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -80,7 +80,9 @@ LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) = CONFIG_KERNEL_LZMA
LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) = CONFIG_KERNEL_LZO
LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) = CONFIG_KERNEL_XZ
-ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
+# If host-uboot-tools is selected by the user, assume it is needed to
+# create a custom image
+ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y)
LINUX_DEPENDENCIES += host-uboot-tools
endif