[openwrt/openwrt] tfa-layerscape: build fiptool again

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/1b46554895d3933d4b94f37f6f916908cb9ad763

commit 1b46554895d3933d4b94f37f6f916908cb9ad763
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Sat Feb 20 19:18:12 2021 +0100

    tfa-layerscape: build fiptool again
    
    The ls-ddr-phy package needs fiptool options that are not
    available via the version from arm-trusted-firmware-tools.
    This breaks build for layerscape with the recently added LX2160a:
    
      create: unrecognized option '--ddr-immem-udimm-1d'
    
    Use the tfa-layerscape variant again for now, but rename it to
    fiptool-layerscape to indicate that it's a specific variant.
    
    This reverts 84bc7d31e0a8 ("tfa-layerscape: don't build fiptool").
    
    Fixes: f59d7aab2a37 ("layerscape: add ddr-phy package")
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
    (cherry picked from commit 910b5d669f907656c6af14242db2482be6a79323)
---
 package/boot/tfa-layerscape/Makefile            | 9 +++++++--
 package/firmware/layerscape/ls-ddr-phy/Makefile | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index d5a1664278..6285da6a15 100644
--- a/package/boot/tfa-layerscape/Makefile
+++ b/package/boot/tfa-layerscape/Makefile
@@ -15,19 +15,24 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf
 PKG_SOURCE_VERSION:=7d748e6f0ec652ba7c43733dc67a3d0b0217390a
 PKG_MIRROR_HASH:=d209c9ad18aac9f18375450b98b8dab00f0382ccb485df14623bf9b72ea1dd9b
-PKG_BUILD_DEPENDS:=arm-trusted-firmware-tools/host tfa-layerscape/host
+PKG_BUILD_DEPENDS:=tfa-layerscape/host
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 HOST_CFLAGS += -Wall -Werror -pedantic -std=c99
 define Host/Compile
+	$(MAKE) -C \
+		$(HOST_BUILD_DIR)/tools/fiptool \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)"
 	$(MAKE) -C \
 		$(HOST_BUILD_DIR)/plat/nxp/tools \
 		CFLAGS="$(HOST_CFLAGS)"
 endef
 
 define Host/Install
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/fiptool/fiptool $(STAGING_DIR_HOST)/bin/fiptool-layerscape
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/plat/nxp/tools/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/plat/nxp/tools/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap
 endef
@@ -151,7 +156,7 @@ define Build/Compile
 		fip pbl PLAT=$(PLAT) BOOT_MODE=$(BOOT_MODE) \
 		RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \
 		BL33=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-uboot.bin \
-		FIPTOOL=$(STAGING_DIR_HOST)/bin/fiptool \
+		FIPTOOL=$(STAGING_DIR_HOST)/bin/fiptool-layerscape \
 		CREATE_PBL=$(STAGING_DIR_HOST)/bin/tfa-create-pbl \
 		BYTE_SWAP=$(STAGING_DIR_HOST)/bin/tfa-byte-swap
 endef
diff --git a/package/firmware/layerscape/ls-ddr-phy/Makefile b/package/firmware/layerscape/ls-ddr-phy/Makefile
index ea2ec311b8..bd861962e7 100644
--- a/package/firmware/layerscape/ls-ddr-phy/Makefile
+++ b/package/firmware/layerscape/ls-ddr-phy/Makefile
@@ -29,7 +29,7 @@ endef
 
 define Build/Compile
 	cd $(PKG_BUILD_DIR)/lx2160a/ && \
-	tfa-fiptool create \
+	fiptool-layerscape create \
 		--ddr-immem-udimm-1d ddr4_pmu_train_imem.bin \
 		--ddr-immem-udimm-2d ddr4_2d_pmu_train_imem.bin \
 		--ddr-dmmem-udimm-1d ddr4_pmu_train_dmem.bin \