layerscape: convert to use TF-A for firmware

[openwrt/staging/wigyori.git] / package / boot / uboot-layerscape / Makefile

diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile
index 45140441001c256258f409c00dccdb03a17adbb4..ddf71bd986b948dc57d4596539e9480f9d3d3323 100644 (file)
--- a/package/boot/uboot-layerscape/Makefile
+++ b/package/boot/uboot-layerscape/Makefile
@@ -6,16 +6,15 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=uboot-layerscape
-PKG_VERSION:=2017.09
+PKG_VERSION:=lsdk-1903
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/qoriq-open-source/u-boot.git
-PKG_SOURCE_VERSION:=fbedf04c1bad675eadbac86febdcf759441a02af
-PKG_MIRROR_HASH:=4f92c93ce1258c54c314a8259c6849ca62f035f36fe1ddb6f7851281c2f5c244
+PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot
+PKG_SOURCE_VERSION:=80b2d2bc4cab0a8363c9b7eba8064b1795f12670
+PKG_MIRROR_HASH:=5c467af40b4479f0ea16697ab54602bed815a23212293184943dca8a3a406d5c
 
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
@@ -25,43 +24,104 @@ define U-Boot/Default
   BUILD_SUBTARGET:=armv8_64b
   BUILD_DEVICES:=$(1)
   UBOOT_IMAGE:=u-boot-dtb.bin
-  HIDDEN:=y
+  ENV_SIZE:=0x2000
+endef
+
+define U-Boot/ls1012ardb
+  NAME:=NXP LS1012ARDB
+  UBOOT_CONFIG:=ls1012ardb_tfa
+  ENV_SIZE:=0x40000
+endef
+
+define U-Boot/ls1012afrwy
+  NAME:=NXP LS1012AFRWY
+  UBOOT_CONFIG:=ls1012afrwy_tfa
+  ENV_SIZE:=0x10000
 endef
 
 define U-Boot/ls1043ardb
-  NAME:=NXP ls1043ardb 64b Dev Board
+  NAME:=NXP LS1043ARDB
+  UBOOT_CONFIG:=ls1043ardb_tfa
 endef
 
+define U-Boot/ls1043ardb-sdboot
+  NAME:=NXP LS1043ARDB SD Card Boot
+  UBOOT_CONFIG:=ls1043ardb_tfa
+endef
+
+
 define U-Boot/ls1046ardb
-  NAME:=NXP ls1046ardb 64b Dev Board
-  UBOOT_CONFIG:=ls1046ardb_qspi
+  NAME:=NXP LS1046ARDB
+  UBOOT_CONFIG:=ls1046ardb_tfa
 endef
 
-define U-Boot/ls1012ardb
-  NAME:=NXP ls1012ardb 64b Dev Board
-  UBOOT_CONFIG:=ls1012ardb_qspi
+define U-Boot/ls1046ardb-sdboot
+  NAME:=NXP LS1046ARDB SD Card Boot
+  UBOOT_CONFIG:=ls1046ardb_tfa
 endef
 
+
 define U-Boot/ls1088ardb
-  NAME:=NXP ls1088ardb 64b Dev Board
-  UBOOT_CONFIG:=ls1088ardb_qspi
+  NAME:=NXP LS1088ARDB
+  UBOOT_CONFIG:=ls1088ardb_tfa
+endef
+
+
+define U-Boot/ls1088ardb-sdboot
+  NAME:=NXP LS1088ARDB SD Card Boot
+  UBOOT_CONFIG:=ls1088ardb_tfa
 endef
 
 define U-Boot/ls2088ardb
-  NAME:=NXP ls2088ardb 64b Dev Board
-  UBOOT_CONFIG:=ls2080ardb
+  NAME:=NXP LS2088ARDB
+  UBOOT_CONFIG:=ls2088ardb_tfa
+endef
+
+define U-Boot/ls1021atwr
+  NAME:=NXP LS1021ATWR
+  BUILD_SUBTARGET:=armv7
+  UBOOT_CONFIG:=ls1021atwr_nor
+  ENV_SIZE:=0x20000
 endef
 
+define U-Boot/ls1021atwr-sdboot
+  NAME:=NXP LS1021ATWR SD Card Boot
+  BUILD_SUBTARGET:=armv7
+  UBOOT_CONFIG:=ls1021atwr_sdcard_ifc
+  UBOOT_IMAGE:=u-boot-with-spl-pbl.bin
+  ENV_SIZE:=0x20000
+endef
+
+define U-Boot/ls1021aiot-sdboot
+  NAME:=NXP LS1021AIOT SD Card Boot
+  BUILD_SUBTARGET:=armv7
+  UBOOT_CONFIG:=ls1021aiot_sdcard
+  UBOOT_IMAGE:=u-boot-with-spl-pbl.bin
+  ENV_SIZE:=0x2000
+endef
+
+
 UBOOT_TARGETS := \
-       ls1043ardb \
-       ls1046ardb \
-       ls1012ardb \
-       ls1088ardb \
-       ls2088ardb
+  ls1012ardb \
+  ls1012afrwy \
+  ls1043ardb \
+  ls1043ardb-sdboot \
+  ls1046ardb \
+  ls1046ardb-sdboot \
+  ls1088ardb \
+  ls1088ardb-sdboot \
+  ls2088ardb \
+  ls1021atwr \
+  ls1021atwr-sdboot \
+  ls1021aiot-sdboot
 
 define Build/InstallDev
        $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(BUILD_SUBTARGET)-uboot.bin
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) \
+               $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.bin
+       $(PKG_BUILD_DIR)/tools/mkenvimage -s $(ENV_SIZE) \
+               -o $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot-env.bin \
+               files/$(BUILD_VARIANT)-uEnv.txt
 endef
 
 define Package/u-boot/install/default