From 14ce999924012b99c61b336527d1bc224823b78a Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 11 Aug 2022 23:29:52 +0200 Subject: [PATCH] trusted-firmware-a.mk: pass DTC path similar to u-boot.mk Instead of relying on dtc being provided by the build host use the dtc from $(LINUX_DIR) similar to how it's done also in u-boot.mk. For this to work kernel.mk now needs to be included before trusted-firmware-a.mk, add this include to all affected packages. Signed-off-by: Daniel Golle --- include/trusted-firmware-a.mk | 3 +++ package/boot/arm-trusted-firmware-bcm63xx/Makefile | 1 + package/boot/arm-trusted-firmware-mediatek/Makefile | 1 + package/boot/arm-trusted-firmware-mvebu/Makefile | 1 + package/boot/arm-trusted-firmware-sunxi/Makefile | 1 + 5 files changed, 7 insertions(+) diff --git a/include/trusted-firmware-a.mk b/include/trusted-firmware-a.mk index d95250452b1..46fc52b15e4 100644 --- a/include/trusted-firmware-a.mk +++ b/include/trusted-firmware-a.mk @@ -72,10 +72,13 @@ define Build/Configure/Trusted-Firmware-A $(INSTALL_DIR) $(STAGING_DIR)/usr/include endef +DTC=$(wildcard $(LINUX_DIR)/scripts/dtc/dtc) + define Build/Compile/Trusted-Firmware-A +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CROSS_COMPILE=$(TARGET_CROSS) \ OPENSSL_DIR=$(STAGING_DIR_HOST) \ + $(if $(DTC),DTC="$(DTC)") \ PLAT=$(PLAT) \ BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \ $(TFA_MAKE_FLAGS) diff --git a/package/boot/arm-trusted-firmware-bcm63xx/Makefile b/package/boot/arm-trusted-firmware-bcm63xx/Makefile index 12571e8d963..7db1fbfff0c 100644 --- a/package/boot/arm-trusted-firmware-bcm63xx/Makefile +++ b/package/boot/arm-trusted-firmware-bcm63xx/Makefile @@ -13,6 +13,7 @@ PKG_MIRROR_HASH:=9d5d04f572b1b6ddc6eb3064b9cb09f5fe982e82d350790041d35316349af12 PKG_MAINTAINER:=Rafał Miłecki +include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/trusted-firmware-a.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile index 30488333f8b..48feae4b60a 100644 --- a/package/boot/arm-trusted-firmware-mediatek/Makefile +++ b/package/boot/arm-trusted-firmware-mediatek/Makefile @@ -19,6 +19,7 @@ PKG_MIRROR_HASH:=4af9ce8e11511afee7f588cc982946c06339edbfa47afef6a7f3e2231ac9f34 PKG_MAINTAINER:=Daniel Golle +include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/trusted-firmware-a.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/arm-trusted-firmware-mvebu/Makefile b/package/boot/arm-trusted-firmware-mvebu/Makefile index 9a7e1340a92..dba4836a6b9 100644 --- a/package/boot/arm-trusted-firmware-mvebu/Makefile +++ b/package/boot/arm-trusted-firmware-mvebu/Makefile @@ -13,6 +13,7 @@ PKG_HASH:=53422dc649153838e03820330ba17cb10afe3e330ecde0db11e4d5f1361a33e6 PKG_MAINTAINER:=Vladimir Vid +include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/trusted-firmware-a.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/arm-trusted-firmware-sunxi/Makefile b/package/boot/arm-trusted-firmware-sunxi/Makefile index 0abfbae7501..178b3958b82 100644 --- a/package/boot/arm-trusted-firmware-sunxi/Makefile +++ b/package/boot/arm-trusted-firmware-sunxi/Makefile @@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=license.md PKG_MAINTAINER:=Hauke Mehrtens +include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/trusted-firmware-a.mk include $(INCLUDE_DIR)/package.mk -- 2.30.2