* dtc: fixup platform support for dtc

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8134 33e552b5-05e3-0310-8538-816dae2090ed

8 files changed, 16 insertions, 19 deletions

diff --git a/platforms/Kconfig b/platforms/Kconfig
index 45c11642a..1bafde07b 100644
--- a/platforms/Kconfig
+++ b/platforms/Kconfig
@@ -22,6 +22,7 @@ config PLATFORM
 
 source "platforms/architecture.in"
 source "platforms/kernel.in"
+source "platforms/dtc.in"
 source "platforms/console.in"
 
 menu "bootloaders                   "
diff --git a/rules/dtc.in b/platforms/dtc.in
index d63695985..c98a16ed5 100644
--- a/rules/dtc.in
+++ b/platforms/dtc.in
@@ -1,3 +1,6 @@
+config HOST_DTC
+	bool
+
 menuconfig DTC
 	bool
 	select HOST_DTC
diff --git a/rules/Kconfig b/rules/Kconfig
index 622877691..2a536b38d 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -39,7 +39,6 @@ endmenu
 menu "Core (libc, locales)          "
 source "rules/platforms.in"
 source "rules/klibc.in"
-source "rules/dtc.in"
 source "rules/libc.in"
 source "rules/gcclibs.in"
 source "rules/locales.in"
diff --git a/rules/dtc.make b/rules/dtc.make
index da5c5e8e3..4be64b3c3 100644
--- a/rules/dtc.make
+++ b/rules/dtc.make
@@ -12,9 +12,7 @@
 #
 # We provide this package
 #
-ifdef PTXCONF_ARCH_PPC
 PACKAGES-$(PTXCONF_DTC) += dtc
-endif
 
 # ----------------------------------------------------------------------------
 # Get
@@ -46,7 +44,7 @@ $(STATEDIR)/dtc.extract: $(dtc_extract_deps_default)
 
 dtc_prepare: $(STATEDIR)/dtc.prepare
 
-$(STATEDIR)/dtc.prepare: $(dtc_prepare_deps_default)
+$(STATEDIR)/dtc.prepare: $(dtc_prepare_deps_default) $(STATEDIR)/host-dtc.install
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -78,7 +76,7 @@ dtc_targetinstall: $(STATEDIR)/dtc.targetinstall
 
 $(STATEDIR)/dtc.targetinstall: $(dtc_targetinstall_deps_default)
 	@$(call targetinfo, $@)
-	PATH=$(HOST_PATH) dtc $(PTXCONF_DTC_EXTRA_ARGS) -I dts -O dtb \
+	$(PTXCONF_SYSROOT_HOST)/bin/dtc $(PTXCONF_DTC_EXTRA_ARGS) -I dts -O dtb \
 		$(PTXCONF_DTC_OFTREE_DTS) > $(IMAGEDIR)/oftree
 	
 	@$(call touch, $@)
diff --git a/rules/host-dtc.in b/rules/host-dtc.in
deleted file mode 100644
index c017131d8..000000000
--- a/rules/host-dtc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-menuconfig HOST_DTC
-	depends on ARCH_PPC
-	bool
-	prompt "device tree compiler (dtc)"
-	default y
-	help
-	  Kernels compiled with arch=powerpc need a device tree
-	  for startup. The device tree compiler (DTC) is used
-	  to generate this tree from a dts (device tree source)
-	  file usually shipped with the kernel.
diff --git a/rules/host-dtc.make b/rules/host-dtc.make
index 314328fc6..60d7aaed8 100644
--- a/rules/host-dtc.make
+++ b/rules/host-dtc.make
@@ -17,10 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_DTC) += host-dtc
 #
 # Paths and names
 #
-HOST_DTC_VERSION	:= git-20070301
+HOST_DTC_VERSION	:= v1.1.0
 HOST_DTC		:= dtc-$(HOST_DTC_VERSION)
-HOST_DTC_SUFFIX		:= tar.gz
-HOST_DTC_URL		:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_DTC).$(HOST_DTC_SUFFIX)
+HOST_DTC_SUFFIX		:= tgz
+HOST_DTC_URL		:= http://www.jdl.com/software/$(HOST_DTC).$(HOST_DTC_SUFFIX)
 HOST_DTC_SOURCE		:= $(SRCDIR)/$(HOST_DTC).$(HOST_DTC_SUFFIX)
 HOST_DTC_DIR		:= $(HOST_BUILDDIR)/$(HOST_DTC)
 
diff --git a/rules/hosttools.in b/rules/hosttools.in
index f9a82dd07..5053a114f 100644
--- a/rules/hosttools.in
+++ b/rules/hosttools.in
@@ -20,7 +20,6 @@ comment "------------------------------"
 comment "Kernel Tools                  "
 comment "------------------------------"
 
-source "rules/host-dtc.in"
 source "rules/host-util-linux.in"
 source "rules/host-umkimage.in"
 source "rules/host-mkelfImage.in"
diff --git a/rules/platforms.in b/rules/platforms.in
index a82382efe..fc75d694e 100644
--- a/rules/platforms.in
+++ b/rules/platforms.in
@@ -7,3 +7,10 @@ config KERNEL
 config U_BOOT_V2
 	bool
 
+config HOST_DTC
+	bool
+
+config DTC
+	bool
+	select HOST_DTC
+