aboutsummaryrefslogtreecommitdiff
path: root/linux/Config.in
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-03-05 21:04:14 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-03-05 21:04:14 +0100
commit92b8bd0879e5f594d1233091437ac9a8b0c240d7 (patch)
treec0196bf0d0ad2603198f469e0eda88fe71b7abc0 /linux/Config.in
parent528f16547689fa771bc7cb8de0885286dd439c17 (diff)
parentfb4a33e586bc041a43cd415869e91d29287dcefd (diff)
downloadbuildroot-92b8bd0879e5f594d1233091437ac9a8b0c240d7.tar.gz
buildroot-92b8bd0879e5f594d1233091437ac9a8b0c240d7.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
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 5afd620d98..bc6cd1b5f7 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