projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
layerscape: update PKG_HASH / PKG_MIRROR_HASH
[openwrt/openwrt.git] / package / boot / tfa-layerscape / Makefile
diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index 28014e87f210817532cc48149e498924f34bb175..1be74216e11bcc3103f24d72dd7031694961ba48 100644 (file)
--- a/package/boot/tfa-layerscape/Makefile
+++ b/package/boot/tfa-layerscape/Makefile
@@ -8,155 +8,177 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tfa-layerscape
-PKG_VERSION:=lsdk-1903
-PKG_RELEASE:=1
+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:=7e34aebe658c7c3439d2d68b0ce6b9776e8e6996
-PKG_MIRROR_HASH:=9cf0bc32fa589a0ee7c48c87898679e645341f29da1253d0ba5d2e82c6ea074d
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=uboot-layerscape tfa-layerscape/host
+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)/package.mk
 
-define Package/tfa-layerscape/Config
-  define Package/tfa-$(1)
-    SECTION:=boot
-    CATEGORY:=Boot Loaders
-    TITLE:=$(2)
-    DEPENDS:=@TARGET_layerscape_armv8_64b +layerscape-rcw-$(1)
-    HIDDEN:=1
-    VARIANT:=$(1)
-    BIN_BL2:=$(3)
-    BIN_FIP:=$(4)
-  endef
-endef
-
-define Package/tfa-layerscape/Install
-  define Package/tfa-$(1)/install
-       $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-       $(CP) $(PKG_BUILD_DIR)/$(BIN_BL2) $(STAGING_DIR_IMAGE)/$(1)-bl2.pbl
-       $(CP) $(PKG_BUILD_DIR)/$(BIN_FIP) $(STAGING_DIR_IMAGE)/$(1)-fip.bin
-  endef
-endef
-
-define Build/Compile
-       $(eval $(Package/tfa-layerscape/$(BUILD_VARIANT))) \
-       $(MAKE) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) \
-               fip pbl PLAT=$(PLAT) BOOT_MODE=$(BOOT_MODE) \
-               RCW=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-rcw.bin \
-               BL33=$(STAGING_DIR_IMAGE)/$(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
-endef
-
 HOST_CFLAGS += -Wall -Werror -pedantic -std=c99
 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))
 endef
 
-define Package/tfa-layerscape/ls1012ardb
+define Package/tfa-ls1012a-frdm
+  $(Package/tfa-generic)
+  TITLE:=NXP LS1012AFRDM Trusted Firmware
+  PLAT:=ls1012afrdm
+  BOOT_MODE:=qspi
+endef
+
+define Package/tfa-ls1012a-rdb
+  $(Package/tfa-generic)
   TITLE:=NXP LS1012ARDB Trusted Firmware
   PLAT:=ls1012ardb
   BOOT_MODE:=qspi
-  BIN_BL2:=build/ls1012ardb/release/bl2_qspi.pbl
-  BIN_FIP:=build/ls1012ardb/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1012afrwy
+define Package/tfa-ls1012a-frwy-sdboot
+  $(Package/tfa-generic)
   TITLE:=NXP LS1012AFRWY Trusted Firmware
   PLAT:=ls1012afrwy
   BOOT_MODE:=qspi
-  BIN_BL2:=build/ls1012afrwy/release/bl2_qspi.pbl
-  BIN_FIP:=build/ls1012afrwy/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1043ardb
+define Package/tfa-ls1043a-rdb
+  $(Package/tfa-generic)
   TITLE:=NXP LS1043ARDB Trusted Firmware
   PLAT:=ls1043ardb
   BOOT_MODE:=nor
-  BIN_BL2:=build/ls1043ardb/release/bl2_nor.pbl
-  BIN_FIP:=build/ls1043ardb/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1043ardb-sdboot
+define Package/tfa-ls1043a-rdb-sdboot
+  $(Package/tfa-generic)
   TITLE:=NXP LS1043ARDB SD Boot Trusted Firmware
   PLAT:=ls1043ardb
   BOOT_MODE:=sd
-  BIN_BL2:=build/ls1043ardb/release/bl2_sd.pbl
-  BIN_FIP:=build/ls1043ardb/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1046ardb
+define Package/tfa-ls1046a-frwy
+  $(Package/tfa-generic)
+  TITLE:=NXP LS1046AFRWY Trusted Firmware
+  PLAT:=ls1046afrwy
+  BOOT_MODE:=qspi
+endef
+
+define Package/tfa-ls1046a-frwy-sdboot
+  $(Package/tfa-generic)
+  TITLE:=NXP LS1046AFRWY SD Boot Trusted Firmware
+  PLAT:=ls1046afrwy
+  BOOT_MODE:=sd
+endef
+
+define Package/tfa-ls1046a-rdb
+  $(Package/tfa-generic)
   TITLE:=NXP LS1046ARDB Trusted Firmware
   PLAT:=ls1046ardb
   BOOT_MODE:=qspi
-  BIN_BL2:=build/ls1046ardb/release/bl2_qspi.pbl
-  BIN_FIP:=build/ls1046ardb/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1046ardb-sdboot
+define Package/tfa-ls1046a-rdb-sdboot
+  $(Package/tfa-generic)
   TITLE:=NXP LS1046ARDB SD Boot Trusted Firmware
   PLAT:=ls1046ardb
   BOOT_MODE:=sd
-  BIN_BL2:=build/ls1046ardb/release/bl2_sd.pbl
-  BIN_FIP:=build/ls1046ardb/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1088ardb
+define Package/tfa-ls1088a-rdb
+  $(Package/tfa-generic)
   TITLE:=NXP LS1088ARDB Trusted Firmware
   PLAT:=ls1088ardb
   BOOT_MODE:=qspi
-  BIN_BL2:=build/ls1088ardb/release/bl2_qspi.pbl
-  BIN_FIP:=build/ls1088ardb/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1088ardb-sdboot
+define Package/tfa-ls1088a-rdb-sdboot
+  $(Package/tfa-generic)
   TITLE:=NXP LS1088ARDB SD Boot Trusted Firmware
   PLAT:=ls1088ardb
   BOOT_MODE:=sd
-  BIN_BL2:=build/ls1088ardb/release/bl2_sd.pbl
-  BIN_FIP:=build/ls1088ardb/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls2088ardb
+define Package/tfa-ls2088a-rdb
+  $(Package/tfa-generic)
   TITLE:=NXP LS2088ARDB Trusted Firmware
   PLAT:=ls2088ardb
   BOOT_MODE:=nor
-  BIN_BL2:=build/ls2088ardb/release/bl2_nor.pbl
-  BIN_FIP:=build/ls2088ardb/release/fip.bin
+endef
+
+define Package/tfa-lx2160a-rdb
+  $(Package/tfa-generic)
+  TITLE:=NXP LX2160ARDB Trusted Firmware
+  PLAT:=lx2160ardb
+  BOOT_MODE:=flexspi_nor
+endef
+
+define Package/tfa-lx2160a-rdb-sdboot
+  $(Package/tfa-generic)
+  TITLE:=NXP LX2160ARDB SD Boot Trusted Firmware
+  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 := \
-  ls1012ardb \
-  ls1012afrwy \
-  ls1043ardb \
-  ls1043ardb-sdboot \
-  ls1046ardb \
-  ls1046ardb-sdboot \
-  ls1088ardb \
-  ls1088ardb-sdboot \
-  ls2088ardb
+  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 \
+  lx2160a-rdb \
+  lx2160a-rdb-sdboot
 
 $(eval $(call HostBuild))
 $(foreach tfa,$(TFAS), \
-       $(eval $(Package/tfa-layerscape/$(tfa))) \
-       $(eval $(call Package/tfa-layerscape/Config,$(tfa),$(TITLE),$(BIN_BL2),$(BIN_FIP))) \
-       $(eval $(call Package/tfa-layerscape/Install,$(tfa))) \
-       $(eval $(call BuildPackage,tfa-$(tfa))) \
+  $(eval $(call BuildPackage,tfa-$(tfa))) \
 )
OpenWrt Source Repository