From 0f3c3a5fb2738b25c62eb0ff8ef7d0654c0b9300 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 20 Jul 2020 15:34:04 +0200 Subject: 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 --- package/firmware/layerscape/fman-ucode/Makefile | 6 +-- package/firmware/layerscape/ls-dpl/Makefile | 10 ++--- package/firmware/layerscape/ls-mc/Makefile | 6 +-- package/firmware/layerscape/ls-rcw/Makefile | 50 ++++++++++++------------- 4 files changed, 36 insertions(+), 36 deletions(-) (limited to 'package/firmware') diff --git a/package/firmware/layerscape/fman-ucode/Makefile b/package/firmware/layerscape/fman-ucode/Makefile index ba1dcf9160..8c76774ac7 100644 --- a/package/firmware/layerscape/fman-ucode/Makefile +++ b/package/firmware/layerscape/fman-ucode/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fman-ucode PKG_VERSION:=LSDK-20.04 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NXP/qoriq-fm-ucode.git @@ -31,9 +31,9 @@ endef define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(CP) $(PKG_BUILD_DIR)/fsl_fman_ucode_ls1043_r1.1_106_4_18.bin \ - $(STAGING_DIR_IMAGE)/ls1043ardb-fman.bin + $(STAGING_DIR_IMAGE)/fsl_ls1043a-rdb-fman.bin $(CP) $(PKG_BUILD_DIR)/fsl_fman_ucode_ls1046_r1.0_106_4_18.bin \ - $(STAGING_DIR_IMAGE)/ls1046ardb-fman.bin + $(STAGING_DIR_IMAGE)/fsl_ls1046a-rdb-fman.bin endef $(eval $(call BuildPackage,layerscape-fman)) diff --git a/package/firmware/layerscape/ls-dpl/Makefile b/package/firmware/layerscape/ls-dpl/Makefile index 89238dce36..d056825ac5 100644 --- a/package/firmware/layerscape/ls-dpl/Makefile +++ b/package/firmware/layerscape/ls-dpl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ls-dpl 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/mc-utils @@ -33,13 +33,13 @@ MAKE_VARS+= \ define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(CP) $(PKG_BUILD_DIR)/config/ls1088a/RDB/dpl-eth.0x1D_0x0D.dtb \ - $(STAGING_DIR_IMAGE)/ls1088ardb-dpl.dtb + $(STAGING_DIR_IMAGE)/fsl_ls1088a-rdb-dpl.dtb $(CP) $(PKG_BUILD_DIR)/config/ls1088a/RDB/dpc.0x1D-0x0D.dtb \ - $(STAGING_DIR_IMAGE)/ls1088ardb-dpc.dtb + $(STAGING_DIR_IMAGE)/fsl_ls1088a-rdb-dpc.dtb $(CP) $(PKG_BUILD_DIR)/config/ls2088a/RDB/dpl-eth.0x2A_0x41.dtb \ - $(STAGING_DIR_IMAGE)/ls2088ardb-dpl.dtb + $(STAGING_DIR_IMAGE)/fsl_ls2088a-rdb-dpl.dtb $(CP) $(PKG_BUILD_DIR)/config/ls2088a/RDB/dpc.0x2A_0x41.dtb \ - $(STAGING_DIR_IMAGE)/ls2088ardb-dpc.dtb + $(STAGING_DIR_IMAGE)/fsl_ls2088a-rdb-dpc.dtb endef $(eval $(call BuildPackage,layerscape-dpl)) diff --git a/package/firmware/layerscape/ls-mc/Makefile b/package/firmware/layerscape/ls-mc/Makefile index d7b88e01a2..0da0b91533 100644 --- a/package/firmware/layerscape/ls-mc/Makefile +++ b/package/firmware/layerscape/ls-mc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ls-mc PKG_VERSION:=LSDK-20.04 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/NXP/qoriq-mc-binary.git @@ -31,9 +31,9 @@ endef define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(CP) $(PKG_BUILD_DIR)/ls1088a/mc_10.20.4_ls1088a.itb \ - $(STAGING_DIR_IMAGE)/ls1088ardb-mc.itb + $(STAGING_DIR_IMAGE)/fsl_ls1088a-rdb-mc.itb $(CP) $(PKG_BUILD_DIR)/ls2088a/mc_10.20.4_ls2088a.itb \ - $(STAGING_DIR_IMAGE)/ls2088ardb-mc.itb + $(STAGING_DIR_IMAGE)/fsl_ls2088a-rdb-mc.itb endef $(eval $(call BuildPackage,layerscape-mc)) diff --git a/package/firmware/layerscape/ls-rcw/Makefile b/package/firmware/layerscape/ls-rcw/Makefile index 848c284d5c..dca0f0ff2b 100644 --- a/package/firmware/layerscape/ls-rcw/Makefile +++ b/package/firmware/layerscape/ls-rcw/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ls-rcw 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/rcw @@ -26,34 +26,34 @@ define Package/layerscape-rcw endef BOARDS := \ - ls1012ardb \ - ls1012afrdm \ - ls1012afrwy \ - ls1043ardb \ - ls1043ardb-sdboot \ - ls1046ardb \ - ls1046ardb-sdboot \ - ls1088ardb \ - ls1088ardb-sdboot \ - ls2088ardb \ - ls1021atwr - -RCW_ls1012ardb :=ls1012ardb/R_SPNH_3508/rcw_1000_default.bin -RCW_ls1012afrdm :=ls1012afrdm/N_SSNP_3305/rcw_800.bin -RCW_ls1012afrwy :=ls1012afrwy/N_SSNP_3305/rcw_1000_default.bin -RCW_ls1043ardb :=ls1043ardb/RR_FQPP_1455/rcw_1600.bin -RCW_ls1043ardb-sdboot :=ls1043ardb/RR_FQPP_1455/rcw_1600_sdboot.bin -RCW_ls1046ardb :=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin -RCW_ls1046ardb-sdboot :=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_sdboot.bin -RCW_ls1088ardb :=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi.bin -RCW_ls1088ardb-sdboot :=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd.bin -RCW_ls2088ardb :=ls2088ardb/FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800.bin -RCW_ls1021atwr :=ls1021atwr/SSR_PNS_30/rcw_1200.bin + ls1012a-rdb \ + ls1012a-frdm \ + ls1012a-frwy-sdboot \ + ls1043a-rdb \ + ls1043a-rdb-sdboot \ + ls1046a-rdb \ + ls1046a-rdb-sdboot \ + ls1088a-rdb \ + ls1088a-rdb-sdboot \ + ls2088a-rdb \ + ls1021a-twr + +RCW_ls1012a-rdb :=ls1012ardb/R_SPNH_3508/rcw_1000_default.bin +RCW_ls1012a-frdm :=ls1012afrdm/N_SSNP_3305/rcw_800.bin +RCW_ls1012a-frwy-sdboot :=ls1012afrwy/N_SSNP_3305/rcw_1000_default.bin +RCW_ls1043a-rdb :=ls1043ardb/RR_FQPP_1455/rcw_1600.bin +RCW_ls1043a-rdb-sdboot :=ls1043ardb/RR_FQPP_1455/rcw_1600_sdboot.bin +RCW_ls1046a-rdb :=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_qspiboot.bin +RCW_ls1046a-rdb-sdboot :=ls1046ardb/RR_FFSSPPPH_1133_5559/rcw_1800_sdboot.bin +RCW_ls1088a-rdb :=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_qspi.bin +RCW_ls1088a-rdb-sdboot :=ls1088ardb/FCQQQQQQQQ_PPP_H_0x1d_0x0d/rcw_1600_sd.bin +RCW_ls2088a-rdb :=ls2088ardb/FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800.bin +RCW_ls1021a-twr :=ls1021atwr/SSR_PNS_30/rcw_1200.bin define Build/InstallDev $(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(foreach board,$(BOARDS), \ - $(CP) $(PKG_BUILD_DIR)/$(RCW_$(board)) $(STAGING_DIR_IMAGE)/$(board)-rcw.bin;) + $(CP) $(PKG_BUILD_DIR)/$(RCW_$(board)) $(STAGING_DIR_IMAGE)/fsl_$(board)-rcw.bin;) endef $(eval $(call BuildPackage,layerscape-rcw)) -- cgit v1.2.3