Merge pull request #3459 from MilhouseVH/le10_fix_dtc_usage

dtc: host target is redundant, drop it

packages/linux-firmware/slice-firmware/package.mk

@@ -8,7 +8,7 @@ PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/FiveNinjas/slice-firmware"
 PKG_URL="https://github.com/libreelec/slice-firmware/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain dtc:host linux"
+PKG_DEPENDS_TARGET="toolchain linux"
 PKG_LONGDESC="BCM270x firmware related stuff for Slice"
 PKG_TOOLCHAIN="manual"
 

packages/tools/dtc/package.mk

@@ -8,28 +8,11 @@ PKG_SHA256="14343cb204aaff386206ea27e39e93d6e35d9a797222e8426f95e57828ca6b94"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
 PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_HOST="Python2:host swig:host"
+PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_TARGET="toolchain dtc:host"
 PKG_LONGDESC="The Device Tree Compiler"
 
-PKG_MAKE_OPTS_HOST="dtc libfdt"
 PKG_MAKE_OPTS_TARGET="dtc fdtput fdtget libfdt"
 
-makeinstall_host() {
-  mkdir -p $TOOLCHAIN/bin
-    cp -P $PKG_BUILD/dtc $TOOLCHAIN/bin
-    cp -P $PKG_BUILD/libfdt/libfdt.so $TOOLCHAIN/lib/
-}
-
-post_makeinstall_host() {
-  python ./pylibfdt/setup.py build_ext --inplace
-  exec_thread_safe python ./pylibfdt/setup.py install --prefix=$TOOLCHAIN
-}
-
-pre_make_target() {
-  make clean BIN=
-}
-
 makeinstall_target() {
   mkdir -p $INSTALL/usr/bin
     cp -P $PKG_BUILD/dtc $INSTALL/usr/bin

packages/tools/u-boot-tools-aml/package.mk

@@ -6,7 +6,8 @@ PKG_VERSION="2016.03"
 PKG_SHA256="e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb"
 PKG_SITE="https://www.denx.de/wiki/U-Boot"
 PKG_URL="ftp://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain dtc:host u-boot-tools-aml:host"
+PKG_DEPENDS_HOST="gcc:host"
+PKG_DEPENDS_TARGET="toolchain u-boot-tools-aml:host"
 PKG_LICENSE="GPL"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 

packages/tools/u-boot/package.mk

@@ -4,10 +4,11 @@
 
 PKG_NAME="u-boot"
 PKG_ARCH="arm aarch64"
-PKG_SITE="https://www.denx.de/wiki/U-Boot"
-PKG_DEPENDS_TARGET="toolchain dtc:host"
 PKG_LICENSE="GPL"
+PKG_SITE="https://www.denx.de/wiki/U-Boot"
+PKG_DEPENDS_TARGET="toolchain swig:host"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
+
 PKG_IS_KERNEL_PKG="yes"
 PKG_STAMP="$UBOOT_SYSTEM"
 
@@ -41,7 +42,7 @@ make_target() {
     [ -n "$ATF_PLATFORM" ] &&  cp -av $(get_build_dir atf)/bl31.bin .
     DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make mrproper
     DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make $($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)
-    DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm _python_sysroot="$TOOLCHAIN" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="$HOST_CC" HOSTLDFLAGS="-L$TOOLCHAIN/lib" HOSTSTRIP="true"
+    DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm _python_sysroot="$TOOLCHAIN" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="$HOST_CC" HOSTLDFLAGS="-L$TOOLCHAIN/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc"
   fi
 }
 

packages/tools/u-boot/patches/rockchip/u-boot-0001-dont-build-libfdt.patch

@@ -1,47 +0,0 @@
-From 3f028d24ed02173fea0950c28b3192f44e40c2a9 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sat, 2 Dec 2017 11:47:07 +0100
-Subject: [PATCH] dont build libfdt
-
----
- scripts/Makefile.spl | 2 +-
- scripts/dtc/Makefile | 2 +-
- tools/dtoc/fdt.py    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
-index e2f0741db6..9264103366 100644
---- a/scripts/Makefile.spl
-+++ b/scripts/Makefile.spl
-@@ -249,7 +249,7 @@ $(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN)
- $(obj)/$(SPL_BIN).dtb: dts/dt-spl.dtb FORCE
- 	$(call if_changed,copy)
- 
--pythonpath = PYTHONPATH=scripts/dtc/pylibfdt
-+pythonpath = python
- 
- quiet_cmd_dtocc = DTOC C  $@
- cmd_dtocc = $(pythonpath) $(srctree)/tools/dtoc/dtoc -d $(obj)/$(SPL_BIN).dtb -o $@ platdata
-diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
-index 90ef2db85c..077acd50d9 100644
---- a/scripts/dtc/Makefile
-+++ b/scripts/dtc/Makefile
-@@ -31,4 +31,4 @@ $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h
- clean-files	:= dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h
- 
- # Added for U-Boot
--subdir-$(CONFIG_PYLIBFDT) += pylibfdt
-+#subdir-$(CONFIG_PYLIBFDT) += pylibfdt
-diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
-index dbc338653b..04f3c5935c 100644
---- a/tools/dtoc/fdt.py
-+++ b/tools/dtoc/fdt.py
-@@ -10,7 +10,7 @@ import struct
- import sys
- 
- import fdt_util
--import libfdt
-+from pylibfdt import libfdt
- 
- # This deals with a device tree, presenting it as an assortment of Node and
- # Prop objects, representing nodes and properties, respectively. This file