Skip to contentSkip to conversation

linux: support multiple custom DTS files

PATCH New Philippe Proulx 2 participants 4 messages Jul 25, 2014 – Jul 29, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux: support multiple custom DTS files

---
 linux/Config.in | 6 ++++--
 linux/linux.mk  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
linux/Config.in +4 -2
index 441301f..a7a3911 100644
@@ -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 file. You can
+	  provide a list of dts paths to copy and build,
+	  separated by spaces.
 
 endif
 
linux/linux.mk +1 -1
index 2a9bf3e..a5699f9 100644
@@ -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 ;	\
Signature · 1 line
2.0.2
#1 lore raw

PATCH 1/1 linux: support multiple custom DTS files

Dear Philippe Proulx,

Quoted 11 lines · Philippe Proulx
---
 linux/Config.in | 6 ++++--
 linux/linux.mk  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
linux/Config.in +0 -0
index 441301f..a7a3911 100644

linux/Config.in config BR2_LINUX_KERNEL_INTREE_DTS_NAME · line 329

Quoted 9 lines
linux/Config.in +2 -2
@@ -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 file. You can

file -> files.

Applied with this fixed, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 linux: support multiple custom DTS files

Quoted 17 lines · Thomas Petazzoni

Dear Philippe Proulx,

Quoted 13 lines · Philippe Proulx
---
 linux/Config.in | 6 ++++--
 linux/linux.mk  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
linux/Config.in +0 -0
index 441301f..a7a3911 100644
@@ -323,10 +323,12 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME
        dts files to build, separated by spaces.
 
Quoted 9 lines

linux/Config.in config BR2_LINUX_KERNEL_INTREE_DTS_NAME · line 329

Quoted 7 lines
linux/Config.in +2 -2
 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 file. You can

file -> files.

Well then you should also apply this to the help text of BR2_LINUX_KERNEL_INTREE_DTS_NAME because I just copied this as is to keep it consistent:

config BR2_LINUX_KERNEL_INTREE_DTS_NAME
string "Device Tree Source file names"
depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
help
Name of the device tree source file, without
the trailing .dts. You can provide a list of
dts files to build, separated by spaces.

Quoted 3 lines

Applied with this fixed, thanks.

Thank you,
Phil

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

#3 lore raw

PATCH 1/1 linux: support multiple custom DTS files

Dear Philippe Proulx,

Quoted 11 lines · Philippe Proulx

Well then you should also apply this to the help text of BR2_LINUX_KERNEL_INTREE_DTS_NAME because I just copied this as is to keep it consistent:

config BR2_LINUX_KERNEL_INTREE_DTS_NAME
string "Device Tree Source file names"
depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
help
Name of the device tree source file, without
the trailing .dts. You can provide a list of
dts files to build, separated by spaces.

Sure, but that should be part of a separate patch. Maybe you just volunteered to send such a patch? :-)

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com