aboutsummaryrefslogtreecommitdiff
path: root/linux/linux.mk
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-03-31 22:59:47 +0200
commit54157c6c2d9fba5ad230294ae1c7dfc0032b1ede (patch)
treee9b2bf00b8300f626876f0b0997c69191e928aaf /linux/linux.mk
parent6d0316dc7b14f6cd2d44e92c6ab581a6ab385234 (diff)
downloadbuildroot-54157c6c2d9fba5ad230294ae1c7dfc0032b1ede.tar.gz
buildroot-54157c6c2d9fba5ad230294ae1c7dfc0032b1ede.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>
Diffstat (limited to 'linux/linux.mk')
-rw-r--r--linux/linux.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index e98b25cb72..cf1cae7cc0 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -370,8 +370,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 ; \
@@ -482,9 +483,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