From 0f3c3a5fb2738b25c62eb0ff8ef7d0654c0b9300 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 20 Jul 2020 15:34:04 +0200 Subject: [PATCH] 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/boot/tfa-layerscape/Makefile | 105 ++++++++---------- package/boot/uboot-layerscape/Makefile | 54 ++++----- ...rdm-uEnv.txt => fsl_ls1012a-frdm-uEnv.txt} | 0 ...v.txt => fsl_ls1012a-frwy-sdboot-uEnv.txt} | 0 ...ardb-uEnv.txt => fsl_ls1012a-rdb-uEnv.txt} | 0 ...nv.txt => fsl_ls1021a-iot-sdboot-uEnv.txt} | 0 ...nv.txt => fsl_ls1021a-twr-sdboot-uEnv.txt} | 0 ...atwr-uEnv.txt => fsl_ls1021a-twr-uEnv.txt} | 0 ...nv.txt => fsl_ls1043a-rdb-sdboot-uEnv.txt} | 0 ...ardb-uEnv.txt => fsl_ls1043a-rdb-uEnv.txt} | 0 ...nv.txt => fsl_ls1046a-rdb-sdboot-uEnv.txt} | 0 ...ardb-uEnv.txt => fsl_ls1046a-rdb-uEnv.txt} | 0 ...nv.txt => fsl_ls1088a-rdb-sdboot-uEnv.txt} | 0 ...ardb-uEnv.txt => fsl_ls1088a-rdb-uEnv.txt} | 0 ...ardb-uEnv.txt => fsl_ls2088a-rdb-uEnv.txt} | 0 .../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 ++++----- target/linux/layerscape/image/armv7.mk | 18 +-- target/linux/layerscape/image/armv8_64b.mk | 90 +++++++-------- 21 files changed, 156 insertions(+), 183 deletions(-) rename package/boot/uboot-layerscape/files/{ls1012afrdm-uEnv.txt => fsl_ls1012a-frdm-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1012afrwy-uEnv.txt => fsl_ls1012a-frwy-sdboot-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1012ardb-uEnv.txt => fsl_ls1012a-rdb-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1021aiot-sdboot-uEnv.txt => fsl_ls1021a-iot-sdboot-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1021atwr-sdboot-uEnv.txt => fsl_ls1021a-twr-sdboot-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1021atwr-uEnv.txt => fsl_ls1021a-twr-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1043ardb-sdboot-uEnv.txt => fsl_ls1043a-rdb-sdboot-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1043ardb-uEnv.txt => fsl_ls1043a-rdb-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1046ardb-sdboot-uEnv.txt => fsl_ls1046a-rdb-sdboot-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1046ardb-uEnv.txt => fsl_ls1046a-rdb-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1088ardb-sdboot-uEnv.txt => fsl_ls1088a-rdb-sdboot-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls1088ardb-uEnv.txt => fsl_ls1088a-rdb-uEnv.txt} (100%) rename package/boot/uboot-layerscape/files/{ls2088ardb-uEnv.txt => fsl_ls2088a-rdb-uEnv.txt} (100%) diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile index 3110a21fc370..b3e947f3b202 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 1cc746f9a680..294045288ba0 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1012afrwy-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1012ardb-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1021aiot-sdboot-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1021atwr-sdboot-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1021atwr-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1043ardb-sdboot-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1043ardb-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1046ardb-sdboot-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1046ardb-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1088ardb-sdboot-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls1088ardb-uEnv.txt rename to 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 similarity index 100% rename from package/boot/uboot-layerscape/files/ls2088ardb-uEnv.txt rename to package/boot/uboot-layerscape/files/fsl_ls2088a-rdb-uEnv.txt diff --git a/package/firmware/layerscape/fman-ucode/Makefile b/package/firmware/layerscape/fman-ucode/Makefile index ba1dcf916040..8c76774ac753 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 89238dce361a..d056825ac5a4 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 d7b88e01a2d0..0da0b9153352 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 848c284d5cad..dca0f0ff2b18 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)) diff --git a/target/linux/layerscape/image/armv7.mk b/target/linux/layerscape/image/armv7.mk index e06c99c338f6..8a86997399b4 100644 --- a/target/linux/layerscape/image/armv7.mk +++ b/target/linux/layerscape/image/armv7.mk @@ -13,18 +13,19 @@ define Device/Default KERNEL_NAME := zImage KERNEL_LOADADDR := 0x80008000 KERNEL_ENTRY_POINT := 0x80008000 + DEVICE_DTS = $(lastword $(subst _, ,$(1))) + SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) IMAGE_SIZE := 64m IMAGE/sysupgrade.bin := append-kernel | pad-to 16M | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata endef -define Device/ls1021atwr +define Device/fsl_ls1021a-twr DEVICE_VENDOR := NXP DEVICE_MODEL := TWR-LS1021A DEVICE_VARIANT := Default DEVICE_PACKAGES += layerscape-rcw - DEVICE_DTS := ls1021a-twr IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-rcw.bin | pad-to 1M | \ @@ -33,11 +34,10 @@ define Device/ls1021atwr ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to 32M | \ append-rootfs | pad-rootfs | check-size - SUPPORTED_DEVICES := fsl,ls1021a-twr endef -TARGET_DEVICES += ls1021atwr +TARGET_DEVICES += fsl_ls1021a-twr -define Device/ls1021atwr-sdboot +define Device/fsl_ls1021a-twr-sdboot DEVICE_VENDOR := NXP DEVICE_MODEL := TWR-LS1021A DEVICE_VARIANT := SD Card Boot @@ -57,16 +57,16 @@ define Device/ls1021atwr-sdboot ls-append-sdhead $(1) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) | append-metadata - SUPPORTED_DEVICES := fsl,ls1021a-twr-sdboot endef -TARGET_DEVICES += ls1021atwr-sdboot +TARGET_DEVICES += fsl_ls1021a-twr-sdboot -define Device/ls1021aiot-sdboot +define Device/fsl_ls1021a-iot-sdboot DEVICE_VENDOR := NXP DEVICE_MODEL := LS1021A-IoT DEVICE_VARIANT := SD Card Boot DEVICE_DTS := ls1021a-iot FILESYSTEMS := ext4 + SUPPORTED_DEVICES := IMAGES := sdcard.img IMAGE/sdcard.img := \ ls-clean | \ @@ -77,4 +77,4 @@ define Device/ls1021aiot-sdboot append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) endef -TARGET_DEVICES += ls1021aiot-sdboot +TARGET_DEVICES += fsl_ls1021a-iot-sdboot diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk index b190e0c041d6..1bf956584cff 100644 --- a/target/linux/layerscape/image/armv8_64b.mk +++ b/target/linux/layerscape/image/armv8_64b.mk @@ -12,20 +12,21 @@ define Device/Default KERNEL := kernel-bin | gzip | uImage gzip KERNEL_LOADADDR := 0x80080000 KERNEL_ENTRY_POINT := 0x80080000 + DEVICE_DTS = freescale/$(subst _,-,$(1)) + SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) IMAGE_SIZE := 64m IMAGE/sysupgrade.bin := append-kernel | pad-to 16M | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata endef -define Device/ls1012afrdm +define Device/fsl_ls1012a-frdm DEVICE_VENDOR := NXP DEVICE_MODEL := FRDM-LS1012A DEVICE_PACKAGES += \ layerscape-ppfe \ - tfa-ls1012afrdm \ + tfa-ls1012a-frdm \ kmod-ppfe - DEVICE_DTS := freescale/fsl-ls1012a-frdm BLOCKSIZE := 256KiB IMAGE/firmware.bin := \ ls-clean | \ @@ -41,18 +42,16 @@ define Device/ls1012afrdm check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata KERNEL := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb KERNEL_INITRAMFS := kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb - SUPPORTED_DEVICES := fsl,ls1012a-frdm endef -TARGET_DEVICES += ls1012afrdm +TARGET_DEVICES += fsl_ls1012a-frdm -define Device/ls1012ardb +define Device/fsl_ls1012a-rdb DEVICE_VENDOR := NXP DEVICE_MODEL := LS1012A-RDB DEVICE_PACKAGES += \ layerscape-ppfe \ - tfa-ls1012ardb \ + tfa-ls1012a-rdb \ kmod-ppfe - DEVICE_DTS := freescale/fsl-ls1012a-rdb IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -62,16 +61,15 @@ define Device/ls1012ardb ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to 32M | \ append-rootfs | pad-rootfs | check-size - SUPPORTED_DEVICES := fsl,ls1012a-rdb endef -TARGET_DEVICES += ls1012ardb +TARGET_DEVICES += fsl_ls1012a-rdb -define Device/ls1012afrwy +define Device/fsl_ls1012a-frwy-sdboot DEVICE_VENDOR := NXP DEVICE_MODEL := FRWY-LS1012A DEVICE_PACKAGES += \ layerscape-ppfe \ - tfa-ls1012afrwy \ + tfa-ls1012a-frwy-sdboot \ kmod-ppfe DEVICE_DTS := freescale/fsl-ls1012a-frwy FILESYSTEMS := ext4 @@ -94,17 +92,16 @@ define Device/ls1012afrwy ls-append-sdhead $(1) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) | append-metadata - SUPPORTED_DEVICES := fsl,ls1012a-frwy-sdboot endef -TARGET_DEVICES += ls1012afrwy +TARGET_DEVICES += fsl_ls1012a-frwy-sdboot -define Device/ls1043ardb +define Device/fsl_ls1043a-rdb DEVICE_VENDOR := NXP DEVICE_MODEL := LS1043A-RDB DEVICE_VARIANT := Default DEVICE_PACKAGES += \ layerscape-fman \ - tfa-ls1043ardb \ + tfa-ls1043a-rdb \ fmc fmc-eth-config DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk IMAGE/firmware.bin := \ @@ -116,17 +113,16 @@ define Device/ls1043ardb ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to 32M | \ append-rootfs | pad-rootfs | check-size - SUPPORTED_DEVICES := fsl,ls1043a-rdb endef -TARGET_DEVICES += ls1043ardb +TARGET_DEVICES += fsl_ls1043a-rdb -define Device/ls1043ardb-sdboot +define Device/fsl_ls1043a-rdb-sdboot DEVICE_VENDOR := NXP DEVICE_MODEL := LS1043A-RDB DEVICE_VARIANT := SD Card Boot DEVICE_PACKAGES += \ layerscape-fman \ - tfa-ls1043ardb-sdboot \ + tfa-ls1043a-rdb-sdboot \ fmc fmc-eth-config DEVICE_DTS := freescale/fsl-ls1043a-rdb-sdk FILESYSTEMS := ext4 @@ -137,7 +133,7 @@ define Device/ls1043ardb-sdboot ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-fip.bin | pad-to 5M | \ ls-append $(1)-uboot-env.bin | pad-to 9M | \ - ls-append ls1043ardb-fman.bin | pad-to 15M | \ + ls-append fsl_ls1043a-rdb-fman.bin | pad-to 15M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) @@ -146,17 +142,16 @@ define Device/ls1043ardb-sdboot ls-append-sdhead $(1) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) | append-metadata - SUPPORTED_DEVICES := fsl,ls1043a-rdb-sdboot endef -TARGET_DEVICES += ls1043ardb-sdboot +TARGET_DEVICES += fsl_ls1043a-rdb-sdboot -define Device/ls1046ardb +define Device/fsl_ls1046a-rdb DEVICE_VENDOR := NXP DEVICE_MODEL := LS1046A-RDB DEVICE_VARIANT := Default DEVICE_PACKAGES += \ layerscape-fman \ - tfa-ls1046ardb \ + tfa-ls1046a-rdb \ fmc fmc-eth-config DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk IMAGE/firmware.bin := \ @@ -168,17 +163,16 @@ define Device/ls1046ardb ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to 32M | \ append-rootfs | pad-rootfs | check-size - SUPPORTED_DEVICES := fsl,ls1046a-rdb endef -TARGET_DEVICES += ls1046ardb +TARGET_DEVICES += fsl_ls1046a-rdb -define Device/ls1046ardb-sdboot +define Device/fsl_ls1046a-rdb-sdboot DEVICE_VENDOR := NXP DEVICE_MODEL := LS1046A-RDB DEVICE_VARIANT := SD Card Boot DEVICE_PACKAGES += \ layerscape-fman \ - tfa-ls1046ardb-sdboot \ + tfa-ls1046a-rdb-sdboot \ fmc fmc-eth-config DEVICE_DTS := freescale/fsl-ls1046a-rdb-sdk FILESYSTEMS := ext4 @@ -189,7 +183,7 @@ define Device/ls1046ardb-sdboot ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-fip.bin | pad-to 5M | \ ls-append $(1)-uboot-env.bin | pad-to 9M | \ - ls-append ls1046ardb-fman.bin | pad-to 15M | \ + ls-append fsl_ls1046a-rdb-fman.bin | pad-to 15M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) @@ -198,20 +192,18 @@ define Device/ls1046ardb-sdboot ls-append-sdhead $(1) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) | append-metadata - SUPPORTED_DEVICES := fsl,ls1046a-rdb-sdboot endef -TARGET_DEVICES += ls1046ardb-sdboot +TARGET_DEVICES += fsl_ls1046a-rdb-sdboot -define Device/ls1088ardb +define Device/fsl_ls1088a-rdb DEVICE_VENDOR := NXP DEVICE_MODEL := LS1088A-RDB DEVICE_VARIANT := Default DEVICE_PACKAGES += \ layerscape-mc \ layerscape-dpl \ - tfa-ls1088ardb \ + tfa-ls1088a-rdb \ restool - DEVICE_DTS := freescale/fsl-ls1088a-rdb IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -223,18 +215,17 @@ define Device/ls1088ardb ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to 32M | \ append-rootfs | pad-rootfs | check-size - SUPPORTED_DEVICES := fsl,ls1088a-rdb endef -TARGET_DEVICES += ls1088ardb +TARGET_DEVICES += fsl_ls1088a-rdb -define Device/ls1088ardb-sdboot +define Device/fsl_ls1088a-rdb-sdboot DEVICE_VENDOR := NXP DEVICE_MODEL := LS1088A-RDB DEVICE_VARIANT := SD Card Boot DEVICE_PACKAGES += \ layerscape-mc \ layerscape-dpl \ - tfa-ls1088ardb-sdboot \ + tfa-ls1088a-rdb-sdboot \ restool DEVICE_DTS := freescale/fsl-ls1088a-rdb FILESYSTEMS := ext4 @@ -245,9 +236,9 @@ define Device/ls1088ardb-sdboot ls-append $(1)-bl2.pbl | pad-to 1M | \ ls-append $(1)-fip.bin | pad-to 5M | \ ls-append $(1)-uboot-env.bin | pad-to 10M | \ - ls-append ls1088ardb-mc.itb | pad-to 13M | \ - ls-append ls1088ardb-dpl.dtb | pad-to 14M | \ - ls-append ls1088ardb-dpc.dtb | pad-to 15M | \ + ls-append fsl_ls1088a-rdb-mc.itb | pad-to 13M | \ + ls-append fsl_ls1088a-rdb-dpl.dtb | pad-to 14M | \ + ls-append fsl_ls1088a-rdb-dpc.dtb | pad-to 15M | \ ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) @@ -256,19 +247,17 @@ define Device/ls1088ardb-sdboot ls-append-sdhead $(1) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) | append-metadata - SUPPORTED_DEVICES := fsl,ls1088a-rdb-sdboot endef -TARGET_DEVICES += ls1088ardb-sdboot +TARGET_DEVICES += fsl_ls1088a-rdb-sdboot -define Device/ls2088ardb +define Device/fsl_ls2088a-rdb DEVICE_VENDOR := NXP DEVICE_MODEL := LS2088ARDB DEVICE_PACKAGES += \ layerscape-mc \ layerscape-dpl \ - tfa-ls2088ardb \ + tfa-ls2088a-rdb \ restool - DEVICE_DTS := freescale/fsl-ls2088a-rdb IMAGE/firmware.bin := \ ls-clean | \ ls-append $(1)-bl2.pbl | pad-to 1M | \ @@ -280,11 +269,10 @@ define Device/ls2088ardb ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to 32M | \ append-rootfs | pad-rootfs | check-size - SUPPORTED_DEVICES := fsl,ls2088a-rdb endef -TARGET_DEVICES += ls2088ardb +TARGET_DEVICES += fsl_ls2088a-rdb -define Device/traverse-ls1043 +define Device/traverse_ls1043 DEVICE_VENDOR := Traverse DEVICE_MODEL := LS1043 Boards KERNEL_NAME := Image @@ -314,4 +302,4 @@ define Device/traverse-ls1043 MKUBIFS_OPTS := -m 2048 -e 124KiB -c 4096 SUPPORTED_DEVICES := traverse,ls1043s traverse,ls1043v endef -TARGET_DEVICES += traverse-ls1043 +TARGET_DEVICES += traverse_ls1043 -- 2.30.2