mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-04 06:10:16 +03:00
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained 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
|
||||
|
||||
Reference in New Issue
Block a user