layerscape: harmonize device strings

OpenWrt lately has harmonized device (definition) names to the
pattern vendor_model to improve overall consistency, also with
other values like the DTS compatible.

This patch applies that scheme to the layerscape target.

Since this (intentionally) creates a bigger overlap between DTS names,
compatible, and device definition name, it also moves DEVICE_DTS and
SUPPORTED_DEVICES definitions to the Device/Default blocks.

Apart from that, it also modifies several packages to use consistent
naming in order to keep the $(1) file references working.

While at it, remove one layer of complexity for the setup in
tfa-layerscape package.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

15 files changed, 72 insertions, 87 deletions

diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile
index 3110a21fc3..b3e947f3b2 100644
--- a/package/boot/tfa-layerscape/Makefile
+++ b/package/boot/tfa-layerscape/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tfa-layerscape
 PKG_VERSION:=LSDK-20.04
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/atf
@@ -37,130 +37,115 @@ define Host/Install
 	$(INSTALL_BIN) $(HOST_BUILD_DIR)/plat/nxp/tools/byte_swap $(STAGING_DIR_HOST)/bin/tfa-byte-swap
 endef
 
-define Package/tfa-layerscape/ls1012afrdm
+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-ls1012a-frdm
+  $(Package/tfa-generic)
   TITLE:=NXP LS1012AFRDM Trusted Firmware
   PLAT:=ls1012afrdm
   BOOT_MODE:=qspi
-  BIN_BL2:=build/ls1012afrdm/release/bl2_qspi.pbl
-  BIN_FIP:=build/ls1012afrdm/release/fip.bin
 endef
 
-define Package/tfa-layerscape/ls1012ardb
+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-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-layerscape/Config
-  define Package/tfa-$(1)
-    SECTION:=boot
-    CATEGORY:=Boot Loaders
-    TITLE:=$(2)
-    DEPENDS:=@TARGET_layerscape_armv8_64b +layerscape-rcw +u-boot-$(1)
-    VARIANT:=$(1)
-    BIN_BL2:=$(3)
-    BIN_FIP:=$(4)
-  endef
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/$(BIN_BL2) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-bl2.pbl
-	$(CP) $(PKG_BUILD_DIR)/$(BIN_FIP) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-fip.bin
+	$(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-layerscape/$(BUILD_VARIANT))) \
+	$(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)/$(BUILD_VARIANT)-rcw.bin \
-		BL33=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-uboot.bin \
+		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
 endef
 
 TFAS := \
-  ls1012afrdm \
-  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-rdb \
+  ls1046a-rdb-sdboot \
+  ls1088a-rdb \
+  ls1088a-rdb-sdboot \
+  ls2088a-rdb
 
 $(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 BuildPackage,tfa-$(tfa))) \
 )
diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile
index 1cc746f9a6..294045288b 100644
--- a/package/boot/uboot-layerscape/Makefile
+++ b/package/boot/uboot-layerscape/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-layerscape
 PKG_VERSION:=LSDK-20.04
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://source.codeaurora.org/external/qoriq/qoriq-components/u-boot
@@ -27,67 +27,67 @@ define U-Boot/Default
   ENV_SIZE:=0x2000
 endef
 
-define U-Boot/ls1012afrdm
+define U-Boot/fsl_ls1012a-frdm
   NAME:=NXP LS1012AFRDM
   UBOOT_CONFIG:=ls1012afrdm_tfa
   ENV_SIZE:=0x40000
 endef
 
-define U-Boot/ls1012ardb
+define U-Boot/fsl_ls1012a-rdb
   NAME:=NXP LS1012ARDB
   UBOOT_CONFIG:=ls1012ardb_tfa
   ENV_SIZE:=0x40000
 endef
 
-define U-Boot/ls1012afrwy
+define U-Boot/fsl_ls1012a-frwy-sdboot
   NAME:=NXP LS1012AFRWY
   UBOOT_CONFIG:=ls1012afrwy_tfa
   ENV_SIZE:=0x10000
 endef
 
-define U-Boot/ls1043ardb
+define U-Boot/fsl_ls1043a-rdb
   NAME:=NXP LS1043ARDB
   UBOOT_CONFIG:=ls1043ardb_tfa
 endef
 
-define U-Boot/ls1043ardb-sdboot
+define U-Boot/fsl_ls1043a-rdb-sdboot
   NAME:=NXP LS1043ARDB SD Card Boot
   UBOOT_CONFIG:=ls1043ardb_tfa
 endef
 
-define U-Boot/ls1046ardb
+define U-Boot/fsl_ls1046a-rdb
   NAME:=NXP LS1046ARDB
   UBOOT_CONFIG:=ls1046ardb_tfa
 endef
 
-define U-Boot/ls1046ardb-sdboot
+define U-Boot/fsl_ls1046a-rdb-sdboot
   NAME:=NXP LS1046ARDB SD Card Boot
   UBOOT_CONFIG:=ls1046ardb_tfa
 endef
 
-define U-Boot/ls1088ardb
+define U-Boot/fsl_ls1088a-rdb
   NAME:=NXP LS1088ARDB
   UBOOT_CONFIG:=ls1088ardb_tfa
 endef
 
-define U-Boot/ls1088ardb-sdboot
+define U-Boot/fsl_ls1088a-rdb-sdboot
   NAME:=NXP LS1088ARDB SD Card Boot
   UBOOT_CONFIG:=ls1088ardb_tfa
 endef
 
-define U-Boot/ls2088ardb
+define U-Boot/fsl_ls2088a-rdb
   NAME:=NXP LS2088ARDB
   UBOOT_CONFIG:=ls2088ardb_tfa
 endef
 
-define U-Boot/ls1021atwr
+define U-Boot/fsl_ls1021a-twr
   NAME:=NXP LS1021ATWR
   BUILD_SUBTARGET:=armv7
   UBOOT_CONFIG:=ls1021atwr_nor
   ENV_SIZE:=0x20000
 endef
 
-define U-Boot/ls1021atwr-sdboot
+define U-Boot/fsl_ls1021a-twr-sdboot
   NAME:=NXP LS1021ATWR SD Card Boot
   BUILD_SUBTARGET:=armv7
   UBOOT_CONFIG:=ls1021atwr_sdcard_ifc
@@ -95,7 +95,7 @@ define U-Boot/ls1021atwr-sdboot
   ENV_SIZE:=0x20000
 endef
 
-define U-Boot/ls1021aiot-sdboot
+define U-Boot/fsl_ls1021a-iot-sdboot
   NAME:=NXP LS1021AIOT SD Card Boot
   BUILD_SUBTARGET:=armv7
   UBOOT_CONFIG:=ls1021aiot_sdcard
@@ -104,19 +104,19 @@ define U-Boot/ls1021aiot-sdboot
 endef
 
 UBOOT_TARGETS := \
-  ls1012afrdm \
-  ls1012ardb \
-  ls1012afrwy \
-  ls1043ardb \
-  ls1043ardb-sdboot \
-  ls1046ardb \
-  ls1046ardb-sdboot \
-  ls1088ardb \
-  ls1088ardb-sdboot \
-  ls2088ardb \
-  ls1021atwr \
-  ls1021atwr-sdboot \
-  ls1021aiot-sdboot
+  fsl_ls1012a-frdm \
+  fsl_ls1012a-rdb \
+  fsl_ls1012a-frwy-sdboot \
+  fsl_ls1043a-rdb \
+  fsl_ls1043a-rdb-sdboot \
+  fsl_ls1046a-rdb \
+  fsl_ls1046a-rdb-sdboot \
+  fsl_ls1088a-rdb \
+  fsl_ls1088a-rdb-sdboot \
+  fsl_ls2088a-rdb \
+  fsl_ls1021a-twr \
+  fsl_ls1021a-twr-sdboot \
+  fsl_ls1021a-iot-sdboot
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
diff --git a/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1012a-frdm-uEnv.txt
index f33e6a3f5c..f33e6a3f5c 100644
--- a/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1012a-frdm-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1012afrwy-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1012a-frwy-sdboot-uEnv.txt
index 31178df690..31178df690 100644
--- a/package/boot/uboot-layerscape/files/ls1012afrwy-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1012a-frwy-sdboot-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1012ardb-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1012a-rdb-uEnv.txt
index f109a98b85..f109a98b85 100644
--- a/package/boot/uboot-layerscape/files/ls1012ardb-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1012a-rdb-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1021aiot-sdboot-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1021a-iot-sdboot-uEnv.txt
index 7772daa100..7772daa100 100644
--- a/package/boot/uboot-layerscape/files/ls1021aiot-sdboot-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1021a-iot-sdboot-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1021atwr-sdboot-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1021a-twr-sdboot-uEnv.txt
index da286a24ae..da286a24ae 100644
--- a/package/boot/uboot-layerscape/files/ls1021atwr-sdboot-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1021a-twr-sdboot-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1021atwr-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1021a-twr-uEnv.txt
index d6c5f56fd9..d6c5f56fd9 100644
--- a/package/boot/uboot-layerscape/files/ls1021atwr-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1021a-twr-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1043ardb-sdboot-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1043a-rdb-sdboot-uEnv.txt
index c1596b506a..c1596b506a 100644
--- a/package/boot/uboot-layerscape/files/ls1043ardb-sdboot-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1043a-rdb-sdboot-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1043ardb-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1043a-rdb-uEnv.txt
index 1214bf40c2..1214bf40c2 100644
--- a/package/boot/uboot-layerscape/files/ls1043ardb-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1043a-rdb-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1046ardb-sdboot-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1046a-rdb-sdboot-uEnv.txt
index c1596b506a..c1596b506a 100644
--- a/package/boot/uboot-layerscape/files/ls1046ardb-sdboot-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1046a-rdb-sdboot-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1046ardb-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1046a-rdb-uEnv.txt
index 975b1c1e7f..975b1c1e7f 100644
--- a/package/boot/uboot-layerscape/files/ls1046ardb-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1046a-rdb-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1088ardb-sdboot-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1088a-rdb-sdboot-uEnv.txt
index 2d27f7eb05..2d27f7eb05 100644
--- a/package/boot/uboot-layerscape/files/ls1088ardb-sdboot-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1088a-rdb-sdboot-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls1088ardb-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls1088a-rdb-uEnv.txt
index 7ab5550405..7ab5550405 100644
--- a/package/boot/uboot-layerscape/files/ls1088ardb-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls1088a-rdb-uEnv.txt
diff --git a/package/boot/uboot-layerscape/files/ls2088ardb-uEnv.txt b/package/boot/uboot-layerscape/files/fsl_ls2088a-rdb-uEnv.txt
index fe2febd2ce..fe2febd2ce 100644
--- a/package/boot/uboot-layerscape/files/ls2088ardb-uEnv.txt
+++ b/package/boot/uboot-layerscape/files/fsl_ls2088a-rdb-uEnv.txt