rework device-tree handling

It's not really possible to build a dtb by itself. A lot of included dtsi
and header files are needed. So build the device-trees with the package
that provides these files. Currently that's the kernel package.

This also means, that other kernel packages can have their own device-trees
as well.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 25 insertions, 43 deletions

diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
index e97d56b0c..aed65d40a 100644
--- a/platforms/blspec-entry.in
+++ b/platforms/blspec-entry.in
@@ -4,14 +4,13 @@ menuconfig BLSPEC_ENTRY
 	tristate
 	select KERNEL
 	select KERNEL_INSTALL if !KERNEL_FIT
-	select DTC_INSTALL_OFTREE if DTC
 	prompt "default bootloader spec entry "
 
 if BLSPEC_ENTRY
 
 config BLSPEC_ENTRY_DEVICETREE
 	bool
-	default DTC && !KERNEL_FIT
+	default KERNEL_DTB && !KERNEL_FIT
 
 config BLSPEC_ENTRY_CMDLINE
 	string
diff --git a/platforms/dtc.in b/platforms/dtc.in
deleted file mode 100644
index 5e8b35291..000000000
--- a/platforms/dtc.in
+++ /dev/null
@@ -1,40 +0,0 @@
-## SECTION=devicetree
-
-menuconfig DTC
-	bool
-	select HOST_DTC
-	select KERNEL
-	prompt "Build device tree             "
-	help
-	  Select this to build a device tree for your board.
-	  You will find the device tree binary blob under
-	  platform-nnn/images/ in your workspace.
-
-if DTC
-
-config DTC_INSTALL_OFTREE
-	bool "install oftree to /boot"
-	help
-	  Creates a package to install the 'oftree' file to /boot
-	  of your target system.
-
-config DTC_OFTREE_DTS_PATH
-	string "path to source dts file"
-	default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
-	help
-	  Define path to the dts source file. Multiple directories can be
-	  specified separated by ':'.
-
-config DTC_OFTREE_DTS
-	string "source dts file"
-	default "<yourboard>.dts"
-	help
-	  Select the dts file to use for the device tree binary
-	  blob generation. For relative file names DTC_OFTREE_DTS_PATH
-	  is used as a search path for the device tree files specified
-	  here. Multiple dts files can be specified, separated by spaces.
-
-config DTC_EXTRA_ARGS
-	string "extra options passed to dtc"
-
-endif
diff --git a/platforms/kernel-fit.in b/platforms/kernel-fit.in
index 9585ce64a..b5f878354 100644
--- a/platforms/kernel-fit.in
+++ b/platforms/kernel-fit.in
@@ -5,7 +5,6 @@ menuconfig KERNEL_FIT
 	select KERNEL
 	select HOST_DTC
 	select HOST_U_BOOT_TOOLS
-	select DTC
 	select CODE_SIGNING	if KERNEL_FIT_SIGNED
 	select IMAGE_ROOT_CPIO	if KERNEL_FIT_INITRAMFS
 	prompt "Generate images/linuximage.fit"
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 68899c0f7..c9511729f 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -158,6 +158,30 @@ config KERNEL_IMAGE
 	default "Image"		if KERNEL_IMAGE_RAW
 	default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}.elf" if KERNEL_IMAGE_SIMPLE
 
+menuconfig KERNEL_DTB
+	bool
+	prompt "Build device trees            "
+
+if KERNEL_DTB
+
+config KERNEL_DTS_PATH
+	string "path to source dts file"
+	default "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
+	help
+	  Define path to the dts source file. Multiple directories can be
+	  specified separated by ':'.
+
+config KERNEL_DTS
+	string "source dts file"
+	default "<yourboard>.dts"
+	help
+	  Select the dts file to use for the device tree binary
+	  blob generation. For relative file names DTC_OFTREE_DTS_PATH
+	  is used as a search path for the device tree files specified
+	  here. Multiple dts files can be specified, separated by spaces.
+
+endif
+
 config KERNEL_ZSTD
 	prompt "build zstd hosttool"
 	bool