uboot-mediatek: use intree dtc explicitly

This replaces pylibfdt hack.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile
index d0e59d10179a7920056ff67bc5700ae450574262..a9e6d35f00f0d5d041d5fa3779fac3b6e80734d8 100644 (file)
--- a/package/boot/uboot-mediatek/Makefile
+++ b/package/boot/uboot-mediatek/Makefile
@@ -5,6 +5,8 @@ PKG_VERSION:=2023.07.02
 PKG_HASH:=6b6a48581c14abb0f95bd87c1af4d740922406d7b801002a9f94727fdde021d5
 PKG_BUILD_DEPENDS:=!(TARGET_ramips||TARGET_mediatek_mt7623):arm-trusted-firmware-tools/host
 
+UBOOT_USE_INTREE_DTC:=1
+
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk

diff --git a/package/boot/uboot-mediatek/patches/300-force-pylibfdt-build.patch b/package/boot/uboot-mediatek/patches/300-force-pylibfdt-build.patch
deleted file mode 100644 (file)
index 89cdf60..0000000
--- a/package/boot/uboot-mediatek/patches/300-force-pylibfdt-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2006,26 +2006,7 @@ endif
- # Check dtc and pylibfdt, if DTC is provided, else build them
- PHONY += scripts_dtc
- scripts_dtc: scripts_basic
--      $(Q)if test "$(DTC)" = "$(DTC_INTREE)"; then \
--              $(MAKE) $(build)=scripts/dtc; \
--      else \
--              if ! $(DTC) -v >/dev/null; then \
--                      echo '*** Failed to check dtc version: $(DTC)'; \
--                      false; \
--              else \
--                      if test "$(call dtc-version)" -lt $(DTC_MIN_VERSION); then \
--                              echo '*** Your dtc is too old, please upgrade to dtc $(DTC_MIN_VERSION) or newer'; \
--                              false; \
--                      else \
--                              if [ -n "$(CONFIG_PYLIBFDT)" ]; then \
--                                      if ! echo "import libfdt" | $(PYTHON3) 2>/dev/null; then \
--                                              echo '*** pylibfdt does not seem to be available with $(PYTHON3)'; \
--                                              false; \
--                                      fi; \
--                              fi; \
--                      fi; \
--              fi; \
--      fi
-+      $(MAKE) $(build)=scripts/dtc
- 
- # ---------------------------------------------------------------------------
- quiet_cmd_cpp_lds = LDS     $@