aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-02-03 14:42:51 +0000
committerDaniel Golle <daniel@makrotopia.org>2021-02-03 15:19:14 +0000
commit84bc7d31e0a83688ef00b89b78cd124fb55e594d (patch)
tree709a0390d7288b3b5434f7f2a31bb472df0d765a
parent1f1d8d4f474aebbbb57937797966b7267fc70240 (diff)
downloadupstream-84bc7d31e0a83688ef00b89b78cd124fb55e594d.tar.gz
upstream-84bc7d31e0a83688ef00b89b78cd124fb55e594d.tar.bz2
upstream-84bc7d31e0a83688ef00b89b78cd124fb55e594d.zip
tfa-layerscape: don't build fiptool
tfa-fiptool is now provided by an extra package. Use that instead. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--package/boot/tfa-layerscape/Makefile11
1 files changed, 3 insertions, 8 deletions
diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index b4295c6310..bf3f132c08 100644
--- a/package/boot/tfa-layerscape/Makefile
+++ b/package/boot/tfa-layerscape/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tfa-layerscape
PKG_VERSION:=LSDK-20.04-update-290520
-PKG_RELEASE:=1
+PKG_RELEASE:=2
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:=tfa-layerscape/host
+PKG_BUILD_DEPENDS:=arm-trusted-firmware-tools/host tfa-layerscape/host
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
@@ -23,16 +23,11 @@ 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/tfa-fiptool
$(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
@@ -128,7 +123,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/tfa-fiptool \
+ FIPTOOL=$(STAGING_DIR_HOST)/bin/fiptool \
CREATE_PBL=$(STAGING_DIR_HOST)/bin/tfa-create-pbl \
BYTE_SWAP=$(STAGING_DIR_HOST)/bin/tfa-byte-swap
endef