summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-06-03 11:18:43 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-06-03 11:19:11 +0200
commita080b8a14119beb1a316973cd837e71dea5dba89 (patch)
tree2a3b2f02788140e7d0eb044d9ded3a34eea53e9b
parent051d09535a84b76413bebe611892e7db40ae27ba (diff)
downloadptxdist-a080b8a14119beb1a316973cd837e71dea5dba89.tar.gz
ptxdist-a080b8a14119beb1a316973cd837e71dea5dba89.tar.xz
dtc, kernel: add option to use the dtc from the kernel source
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--platforms/dtc.in8
-rw-r--r--platforms/kernel.in3
-rw-r--r--rules/kernel.make3
3 files changed, 13 insertions, 1 deletions
diff --git a/platforms/dtc.in b/platforms/dtc.in
index 5442c2388..470c36f78 100644
--- a/platforms/dtc.in
+++ b/platforms/dtc.in
@@ -1,5 +1,6 @@
menuconfig HOST_DTC
bool
+ depends on !KERNEL_DTC
prompt "Build device tree compiler "
help
Select this if the HOST_DTC tool is required without
@@ -24,7 +25,8 @@ endif
menuconfig DTC
bool
- select HOST_DTC
+ select HOST_DTC if !DTC_KERNEL
+ select KERNEL_DTC if DTC_KERNEL
select KERNEL
prompt "Build device tree "
help
@@ -48,6 +50,10 @@ config DTC_OFTREE_DTS
blob generation. Default is to use the one shipped with
the kernel.
+config DTC_KERNEL
+ bool
+ prompt "use kernel dtc"
+
config DTC_EXTRA_ARGS
string "extra options passed to dtc"
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 37d7bc63c..176cd11ab 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -191,6 +191,9 @@ config KERNEL_IMAGE
default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}.elf" if KERNEL_IMAGE_SIMPLE && KERNEL_ARCH_POWERPC
default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}" if KERNEL_IMAGE_SIMPLE && ARCH_MICROBLAZE
+config KERNEL_DTC
+ bool
+
config KERNEL_XZ
prompt "build xz-utils hosttool"
bool
diff --git a/rules/kernel.make b/rules/kernel.make
index 84b692d91..29f63285d 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -189,6 +189,9 @@ ifdef PTXCONF_KERNEL_MODULES_INSTALL
@cd $(KERNEL_DIR) && $(KERNEL_PATH) $(KERNEL_ENV) $(MAKE) \
$(KERNEL_MAKEVARS) modules_install
endif
+ifdef PTXCONF_KERNEL_DTC
+ @install -m 755 "$(KERNEL_DIR)/scripts/dtc/dtc" "$(PTXCONF_SYSROOT_HOST)/bin/dtc"
+endif
@$(call touch)