From: Imre Kaloz <kaloz@openwrt.org>
Date: Wed, 11 Nov 2009 13:44:12 +0000 (+0000)
Subject: powerpc: use the in-kernel dtc compiler
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cc222ce56d099c60a945c13d9cce010988b7cb2f;p=openwrt%2Fstaging%2Fnbd.git

powerpc: use the in-kernel dtc compiler

SVN-Revision: 18374
---

diff --git a/target/linux/ppc40x/image/Makefile b/target/linux/ppc40x/image/Makefile
index e03ffd93c8..4544aff4ff 100644
--- a/target/linux/ppc40x/image/Makefile
+++ b/target/linux/ppc40x/image/Makefile
@@ -11,7 +11,7 @@ JFFS2_BLOCKSIZE=128k 64k
 
 define Image/Prepare
 	cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(KDIR)/uImage
-	dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb
+	$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/kilauea.dts > $(KDIR)/openwrt-kilauea.dtb
 endef
 
 define Image/BuildKernel
diff --git a/target/linux/ppc44x/image/Makefile b/target/linux/ppc44x/image/Makefile
index b8d5e95109..aa6851341a 100644
--- a/target/linux/ppc44x/image/Makefile
+++ b/target/linux/ppc44x/image/Makefile
@@ -11,7 +11,7 @@ JFFS2_BLOCKSIZE=256k
 
 define Image/Prepare
 	cp $(LINUX_DIR)/arch/powerpc/boot/cuImage.taishan $(KDIR)/uImage
-		dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb
+	$(LINUX_DIR)/scripts/dtc/dtc -O dtb -R 4 -S 0x20000 $(LINUX_DIR)/arch/powerpc/boot/dts/canyonlands.dts > $(KDIR)/openwrt-canyonlands.dtb
 endef
 
 define Image/BuildKernel
diff --git a/tools/Makefile b/tools/Makefile
index 1456c0d175..6e5eb24cd3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -18,7 +18,6 @@ tools-y += sstrip ipkg-utils genext2fs squashfs squashfs4 mtd-utils lzma-old mki
 tools-y += firmware-utils patch-cmdline quilt yaffs2
 
 tools-$(CONFIG_CCACHE) += ccache
-tools-$(CONFIG_powerpc) += dtc
 tools-dep += lzma
 
 ifdef CONFIG_GCC_VERSION_4_4
diff --git a/tools/dtc/Makefile b/tools/dtc/Makefile
deleted file mode 100644
index c686b204d4..0000000000
--- a/tools/dtc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (C) 2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dtc
-PKG_VERSION:=1.1.0
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://www.jdl.com/software
-PKG_MD5SUM:=6c84b01f500bc989b0b1ad6138fb93d5
-PKG_CAT:=zcat
-HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
-endef
-
-define Host/Install
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/dtc $(STAGING_DIR_HOST)/bin/
-endef
-
-define Host/Clean
-	rm -f $(STAGING_DIR_HOST)/bin/dtc
-endef
-
-$(eval $(call HostBuild))