diff options
| author | Tianling Shen <cnsztl@immortalwrt.org> | 2023-11-25 23:17:15 +0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-11-26 19:44:56 +0100 |
| commit | 8fc4fe7b488e41f79b70b049bf669b0d2088e61f (patch) | |
| tree | 6cfeb0eb3bbd01b9d7be9b8125a166821150cef8 /package/boot | |
| parent | fb3af8611942feb24f9b51934d8d1901050bf0d9 (diff) | |
| download | upstream-8fc4fe7b488e41f79b70b049bf669b0d2088e61f.tar.gz upstream-8fc4fe7b488e41f79b70b049bf669b0d2088e61f.tar.bz2 upstream-8fc4fe7b488e41f79b70b049bf669b0d2088e61f.zip | |
uboot-sunxi: use intree dtc explicitly
This replaces pylibfdt hack.
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Diffstat (limited to 'package/boot')
| -rw-r--r-- | package/boot/uboot-sunxi/Makefile | 2 | ||||
| -rw-r--r-- | package/boot/uboot-sunxi/patches/300-force-pylibfdt-build.patch | 30 |
2 files changed, 2 insertions, 30 deletions
diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 17905802c31..7f50992e695 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -15,6 +15,8 @@ PKG_HASH:=e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341 PKG_MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu> +UBOOT_USE_INTREE_DTC:=1 + include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-sunxi/patches/300-force-pylibfdt-build.patch b/package/boot/uboot-sunxi/patches/300-force-pylibfdt-build.patch deleted file mode 100644 index d34ed6f2ae5..00000000000 --- a/package/boot/uboot-sunxi/patches/300-force-pylibfdt-build.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -2000,26 +2000,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 $@ |