projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tfa-layerscape: Use trusted-firmware-a.mk
[openwrt/openwrt.git] / package / boot / tfa-layerscape / Makefile
diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index b3e947f3b202611f7e27b3d9fa8e6e2d45b5168c..072036da2f1c9c22a9d473d40198dbd915a2d800 100644 (file)
--- a/package/boot/tfa-layerscape/Makefile
+++ b/package/boot/tfa-layerscape/Makefile
@@ -8,16 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tfa-layerscape
-PKG_VERSION:=LSDK-20.04
-PKG_RELEASE:=2
+PKG_VERSION:=21.08
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf
-PKG_SOURCE_VERSION:=4a82c939a0211196e2b80a495f966383803753bb
-PKG_MIRROR_HASH:=31c264551ce800b646d7dcc5baa62cfbb4c8fa3299a93931c7ef71dc3e88380d
+PKG_SOURCE_VERSION:=LSDK-21.08
+PKG_MIRROR_HASH:=893f2d28a77dcc9d4413a619b4719ca5f1f4dc78dd824a8488e7d543e66bcf95
 PKG_BUILD_DEPENDS:=tfa-layerscape/host
 
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/trusted-firmware-a.mk
 include $(INCLUDE_DIR)/package.mk
 
 HOST_CFLAGS += -Wall -Werror -pedantic -std=c99
@@ -25,127 +26,144 @@ define Host/Compile
        $(MAKE) -C \
                $(HOST_BUILD_DIR)/tools/fiptool \
                CFLAGS="$(HOST_CFLAGS)" \
-               LDFLAGS="$(HOST_LDFLAGS)"
+               LDFLAGS="$(HOST_LDFLAGS)" \
+               HOSTCCFLAGS="$(HOST_CFLAGS)"
        $(MAKE) -C \
-               $(HOST_BUILD_DIR)/plat/nxp/tools \
+               $(HOST_BUILD_DIR)/tools/nxp \
                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
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/fiptool/fiptool $(STAGING_DIR_HOST)/bin/fiptool-layerscape
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap
 endef
 
-define Package/tfa-generic
-  SECTION:=boot
-  CATEGORY:=Boot Loaders
-  DEPENDS:=@TARGET_layerscape_armv8_64b +layerscape-rcw +u-boot-fsl_$(subst tfa-,,$(1))
-  VARIANT:=$(subst tfa-,,$(1))
+define Trusted-Firmware-A/Default
+  BUILD_TARGET:=layerscape
+  BUILD_SUBTARGET:=armv8_64b
+  DEPENDS:=+layerscape-rcw +u-boot-fsl_$(1)
 endef
 
-define Package/tfa-ls1012a-frdm
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1012AFRDM Trusted Firmware
+define Trusted-Firmware-A/ls1012a-frdm
+  NAME:=NXP LS1012AFRDM
   PLAT:=ls1012afrdm
   BOOT_MODE:=qspi
 endef
 
-define Package/tfa-ls1012a-rdb
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1012ARDB Trusted Firmware
+define Trusted-Firmware-A/ls1012a-rdb
+  NAME:=NXP LS1012ARDB
   PLAT:=ls1012ardb
   BOOT_MODE:=qspi
 endef
 
-define Package/tfa-ls1012a-frwy-sdboot
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1012AFRWY Trusted Firmware
+define Trusted-Firmware-A/ls1012a-frwy-sdboot
+  NAME:=NXP LS1012AFRWY
   PLAT:=ls1012afrwy
   BOOT_MODE:=qspi
 endef
 
-define Package/tfa-ls1043a-rdb
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1043ARDB Trusted Firmware
+define Trusted-Firmware-A/ls1043a-rdb
+  NAME:=NXP LS1043ARDB
   PLAT:=ls1043ardb
   BOOT_MODE:=nor
 endef
 
-define Package/tfa-ls1043a-rdb-sdboot
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1043ARDB SD Boot Trusted Firmware
+define Trusted-Firmware-A/ls1043a-rdb-sdboot
+  NAME:=NXP LS1043ARDB SD Boot
   PLAT:=ls1043ardb
   BOOT_MODE:=sd
 endef
 
-define Package/tfa-ls1046a-rdb
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1046ARDB Trusted Firmware
+define Trusted-Firmware-A/ls1046a-frwy
+  NAME:=NXP LS1046AFRWY
+  PLAT:=ls1046afrwy
+  BOOT_MODE:=qspi
+endef
+
+define Trusted-Firmware-A/ls1046a-frwy-sdboot
+  NAME:=NXP LS1046AFRWY SD Boot
+  PLAT:=ls1046afrwy
+  BOOT_MODE:=sd
+endef
+
+define Trusted-Firmware-A/ls1046a-rdb
+  NAME:=NXP LS1046ARDB
   PLAT:=ls1046ardb
   BOOT_MODE:=qspi
 endef
 
-define Package/tfa-ls1046a-rdb-sdboot
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1046ARDB SD Boot Trusted Firmware
+define Trusted-Firmware-A/ls1046a-rdb-sdboot
+  NAME:=NXP LS1046ARDB SD Boot
   PLAT:=ls1046ardb
   BOOT_MODE:=sd
 endef
 
-define Package/tfa-ls1088a-rdb
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1088ARDB Trusted Firmware
+define Trusted-Firmware-A/ls1088a-rdb
+  NAME:=NXP LS1088ARDB
   PLAT:=ls1088ardb
   BOOT_MODE:=qspi
 endef
 
-define Package/tfa-ls1088a-rdb-sdboot
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1088ARDB SD Boot Trusted Firmware
+define Trusted-Firmware-A/ls1088a-rdb-sdboot
+  NAME:=NXP LS1088ARDB SD Boot
   PLAT:=ls1088ardb
   BOOT_MODE:=sd
 endef
 
-define Package/tfa-ls2088a-rdb
-  $(Package/tfa-generic)
-  TITLE:=NXP LS2088ARDB Trusted Firmware
+define Trusted-Firmware-A/ls2088a-rdb
+  NAME:=NXP LS2088ARDB
   PLAT:=ls2088ardb
   BOOT_MODE:=nor
 endef
 
-define Build/InstallDev
-       $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-       $(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl2_$(BOOT_MODE).pbl \
-               $(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-bl2.pbl
-       $(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/fip.bin \
-               $(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-fip.bin
+define Trusted-Firmware-A/lx2160a-rdb
+  NAME:=NXP LX2160ARDB
+  PLAT:=lx2160ardb
+  BOOT_MODE:=flexspi_nor
 endef
 
-define Build/Compile
-       $(eval $(Package/tfa-$(BUILD_VARIANT))) \
-       $(MAKE) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) \
-               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 \
-               CREATE_PBL=$(STAGING_DIR_HOST)/bin/tfa-create-pbl \
-               BYTE_SWAP=$(STAGING_DIR_HOST)/bin/tfa-byte-swap
+define Trusted-Firmware-A/lx2160a-rdb-sdboot
+  NAME:=NXP LX2160ARDB SD Boot
+  PLAT:=lx2160ardb
+  BOOT_MODE:=sd
 endef
 
-TFAS := \
+TFA_TARGETS := \
   ls1012a-frdm \
   ls1012a-rdb \
   ls1012a-frwy-sdboot \
   ls1043a-rdb \
   ls1043a-rdb-sdboot \
+  ls1046a-frwy \
+  ls1046a-frwy-sdboot \
   ls1046a-rdb \
   ls1046a-rdb-sdboot \
   ls1088a-rdb \
   ls1088a-rdb-sdboot \
-  ls2088a-rdb
+  ls2088a-rdb \
+  lx2160a-rdb \
+  lx2160a-rdb-sdboot
+
+TFA_MAKE_FLAGS += \
+       fip pbl \
+       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-layerscape \
+       CREATE_PBL=$(STAGING_DIR_HOST)/bin/tfa-create-pbl \
+       BYTE_SWAP=$(STAGING_DIR_HOST)/bin/tfa-byte-swap
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+       $(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl2_$(BOOT_MODE).pbl \
+               $(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-bl2.pbl
+       $(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/fip.bin \
+               $(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-fip.bin
+endef
+
+define Package/trusted-firmware-a/install/default
+endef
 
 $(eval $(call HostBuild))
-$(foreach tfa,$(TFAS), \
-  $(eval $(call BuildPackage,tfa-$(tfa))) \
-)
+$(eval $(call BuildPackage/Trusted-Firmware-A))
OpenWrt Source Repository