From: Philippe Proulx Date: Fri, 25 Jul 2014 21:25:32 +0000 (-0400) Subject: linux: support multiple custom DTS files X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5224cdcc14b11addbfc3a470cd496966d0b378bc;p=buildroot.git linux: support multiple custom DTS files [Thomas: fix minor typo in help text.] Signed-off-by: Philippe Proulx Signed-off-by: Thomas Petazzoni --- diff --git a/linux/Config.in b/linux/Config.in index 441301f1b5..825dd3bf93 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -323,10 +323,12 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME dts files to build, separated by spaces. config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH - string "Device Tree Source file path" + string "Device Tree Source file paths" depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS help - Path to the device tree source file + Path to the device tree source files. You can + provide a list of dts paths to copy and build, + separated by spaces. endif diff --git a/linux/linux.mk b/linux/linux.mk index 2a9bf3e55f..a5699f9d7d 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -264,7 +264,7 @@ endif # configuration has changed. define LINUX_BUILD_CMDS $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS), - cp $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) $(KERNEL_ARCH_PATH)/boot/dts/) + cp $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/) $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \