aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Rafal Susz <rafal.susz@gmail.com>2018-03-13 19:00:05 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-04-09 18:01:27 +0200
commit014dbd4855fa0d52a32d2e2d15b425c64b2e7c95 (patch)
tree33d39a6f753930e632aca68b8e39dd55c9ab4b3a
parent34b8a1c5bcb7523f7f125f3b558d8cb1872cdf66 (diff)
downloadbuildroot-014dbd4855fa0d52a32d2e2d15b425c64b2e7c95.tar.gz
buildroot-014dbd4855fa0d52a32d2e2d15b425c64b2e7c95.tar.bz2
package/linux: fix custom dts files handling
Custom dts files are still conditionally copied based on non existing boolean. So it is currently not possible to use custom dts file(s) at all. List of dts files is now iterated and files are copied into dedicated kernel arch dir. Signed-off-by: Rafal Susz <rafal.susz@gmail.com> Tested-by: Jan Kundrát <jan.kundrat@cesnet.cz> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 54157c6c2d9fba5ad230294ae1c7dfc0032b1ede) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--linux/linux.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 8ef2b03445..8d14f41c6b 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -367,8 +367,9 @@ endif
# Compilation. We make sure the kernel gets rebuilt when the
# configuration has changed.
define LINUX_BUILD_CMDS
- $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
- cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/)
+ @for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \
+ cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ; \
+ done
$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
@@ -479,9 +480,9 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST
endif
endif
-ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
+ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:)
$(error No kernel device tree source specified, check your \
-BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
+BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings)
endif
endif # BR_BUILDING