projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
treewide: package: update missed hashes after switch to ZSTD
[openwrt/openwrt.git] / package / boot / tfa-layerscape / Makefile
diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index 6f0e1758850b58a25b37db5e98d167e9de3c4d9b..b92516ceb0ab51315ffab67679ff9f02779ff2ce 100644 (file)
--- a/package/boot/tfa-layerscape/Makefile
+++ b/package/boot/tfa-layerscape/Makefile
@@ -8,163 +8,146 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tfa-layerscape
-PKG_VERSION:=LSDK-20.12
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=lf-6.1.1-1.0.0
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf
-PKG_SOURCE_VERSION:=LSDK-20.12
-PKG_MIRROR_HASH:=8e3a0bd33c00657beeb2df88a881b1831aeb790751cacd4c4fdf33ffa01e956e
+PKG_SOURCE_URL:=https://github.com/nxp-qoriq/atf
+PKG_SOURCE_VERSION:=lf-6.1.1-1.0.0
+PKG_MIRROR_HASH:=e109ca87a0f432529ab4d1fcd019adc0cd0d3684c96cdf770aac113f9bbe4bd6
 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
 define Host/Compile
        $(MAKE) -C \
                $(HOST_BUILD_DIR)/tools/fiptool \
+               PLAT_FIPTOOL_HELPER_MK="$(HOST_BUILD_DIR)/tools/nxp/plat_fiptool/plat_fiptool.mk" \
                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/create_pbl \
                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
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl/create_pbl $(STAGING_DIR_HOST)/bin/tfa-create-pbl
+       $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/nxp/create_pbl/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/ls1028a-rdb
+  TITLE:=NXP LS1028ARDB
+  PLAT:=ls1028ardb
+  BOOT_MODE:=flexspi_nor
+endef
+
+define Trusted-Firmware-A/ls1028a-rdb-sdboot
+  TITLE:=NXP LS1028ARDB SD Boot
+  PLAT:=ls1028ardb
+  BOOT_MODE:=sd
+endef
+
+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-frwy
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1046AFRWY Trusted Firmware
+define Trusted-Firmware-A/ls1046a-frwy
+  NAME:=NXP LS1046AFRWY
   PLAT:=ls1046afrwy
   BOOT_MODE:=qspi
 endef
 
-define Package/tfa-ls1046a-frwy-sdboot
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1046AFRWY SD Boot Trusted Firmware
+define Trusted-Firmware-A/ls1046a-frwy-sdboot
+  NAME:=NXP LS1046AFRWY SD Boot
   PLAT:=ls1046afrwy
   BOOT_MODE:=sd
 endef
 
-define Package/tfa-ls1046a-rdb
-  $(Package/tfa-generic)
-  TITLE:=NXP LS1046ARDB Trusted Firmware
+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 Package/tfa-lx2160a-rdb
-  $(Package/tfa-generic)
-  TITLE:=NXP LX2160ARDB Trusted Firmware
+define Trusted-Firmware-A/lx2160a-rdb
+  NAME:=NXP LX2160ARDB
   PLAT:=lx2160ardb
   BOOT_MODE:=flexspi_nor
 endef
 
-define Package/tfa-lx2160a-rdb-sdboot
-  $(Package/tfa-generic)
-  TITLE:=NXP LX2160ARDB SD Boot Trusted Firmware
+define Trusted-Firmware-A/lx2160a-rdb-sdboot
+  NAME:=NXP LX2160ARDB SD Boot
   PLAT:=lx2160ardb
   BOOT_MODE:=sd
 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
-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/fiptool-layerscape \
-               CREATE_PBL=$(STAGING_DIR_HOST)/bin/tfa-create-pbl \
-               BYTE_SWAP=$(STAGING_DIR_HOST)/bin/tfa-byte-swap
-endef
-
-TFAS := \
+TFA_TARGETS := \
   ls1012a-frdm \
   ls1012a-rdb \
   ls1012a-frwy-sdboot \
+  ls1028a-rdb \
+  ls1028a-rdb-sdboot \
   ls1043a-rdb \
   ls1043a-rdb-sdboot \
   ls1046a-frwy \
@@ -177,7 +160,25 @@ TFAS := \
   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