aboutsummaryrefslogtreecommitdiff
path: root/linux/Config.in
diff options
context:
space:
mode:
authorGravatar Simon van der Veldt <simon.vanderveldt@gmail.com>2018-02-21 20:53:16 +0100
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-02-25 17:19:11 +0100
commit382fe9f9261812682eab2d35e47aa94dc554380e (patch)
treef6d6c40c47fb3f528d88a457165d2b69ae9e8933 /linux/Config.in
parente1a8cdca5d5990ded69ebf521a4a4aa325fe1f6c (diff)
downloadbuildroot-382fe9f9261812682eab2d35e47aa94dc554380e.tar.gz
buildroot-382fe9f9261812682eab2d35e47aa94dc554380e.tar.bz2
linux: allow both in-tree and custom dts files
For some boards, for example the Raspberry Pi, it's necessary to build in-tree dts files as well as custom/out of tree dts-files (dt-blob.bin). The existing logic made these two options exclusive, this commit changes that to allow both in-tree as well as custom sources for dts files. Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com> [Arnout: re-wrap help, add extra empty line, change = into +=] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'linux/Config.in')
-rw-r--r--linux/Config.in19
1 files changed, 7 insertions, 12 deletions
diff --git a/linux/Config.in b/linux/Config.in
index 1bc8171291..80e85b9e8b 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -363,10 +363,6 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
config BR2_LINUX_KERNEL_APPENDED_DTB
bool
-choice
- prompt "Device tree source"
- default BR2_LINUX_KERNEL_USE_INTREE_DTS
-
config BR2_LINUX_KERNEL_USE_INTREE_DTS
bool "Use a device tree present in the kernel"
help
@@ -374,14 +370,6 @@ config BR2_LINUX_KERNEL_USE_INTREE_DTS
the kernel sources. The dts files are located
in the arch/<arch>/boot/dts folder.
-config BR2_LINUX_KERNEL_USE_CUSTOM_DTS
- bool "Use a custom device tree file"
- help
- Use a custom device tree file, i.e, a device
- tree file that does not belong to the kernel
- source tree.
-endchoice
-
config BR2_LINUX_KERNEL_INTREE_DTS_NAME
string "Device Tree Source file names"
depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
@@ -390,6 +378,13 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME
the trailing .dts. You can provide a list of
dts files to build, separated by spaces.
+config BR2_LINUX_KERNEL_USE_CUSTOM_DTS
+ bool "Use a custom device tree file"
+ help
+ Use a custom device tree file, i.e, a device
+ tree file that does not belong to the kernel
+ source tree.
+
config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
string "Device Tree Source file paths"
depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS