jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/linux: drop useless intermediate DTS booleans

Browse Source 
Just use whatever the user specified in the list. An empty list means no
DTS was specified.

No need to add legacy option, as the behaviour does not change.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Simon van der Veldt <simon.vanderveldt@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Joshua Henderson <joshua.henderson@microchip.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2018-02-26 18:47:21 +01:00 committed by Peter Korsgaard
parent 5be0b3440e
commit f142f23ecf
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
linux/Config.in
View File

@ -363,35 +363,19 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
config BR2_LINUX_KERNEL_APPENDED_DTB config BR2_LINUX_KERNEL_APPENDED_DTB
bool bool
config BR2_LINUX_KERNEL_USE_INTREE_DTS
bool "Use a device tree present in the kernel"
help
Use a device tree source distributed with
the kernel sources. The dts files are located
in the arch/<arch>/boot/dts folder.
config BR2_LINUX_KERNEL_INTREE_DTS_NAME config BR2_LINUX_KERNEL_INTREE_DTS_NAME
string "Device Tree Source file names" string "In-tree Device Tree Source file names"
depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
help help
Name of the device tree source file, without Name of in-tree device tree source file, without
the trailing .dts. You can provide a list of the trailing .dts. You can provide a list of
dts files to build, separated by spaces. 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 config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
string "Device Tree Source file paths" string "Out-of-tree Device Tree Source file paths"
depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS
help help
Path to the device tree source files. You can Path to to out-of-tree device tree source files.
provide a list of dts paths to copy and build, You can provide a list of dts paths to copy and
separated by spaces. build, separated by spaces.
endif endif

4
linux/linux.mk
View File

@ -125,17 +125,13 @@ endif
# going to be installed in the target filesystem. # going to be installed in the target filesystem.
LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null`
ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
endif
ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
# We keep only the .dts files, so that the user can specify both .dts # We keep only the .dts files, so that the user can specify both .dts
# and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
# copied to arch/<arch>/boot/dts, but only the .dts files will # copied to arch/<arch>/boot/dts, but only the .dts files will
# actually be generated as .dtb. # actually be generated as .dtb.
KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
endif
KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME)) KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))