From f5653ce0ae0675449315a3350859f8fc2c93f530 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 20 Jan 2023 01:40:46 +0000 Subject: conf: machine: Use new J7 SoC names over specific board names Now that we have SoC names, we can avoid adding features based on the board name. We expect folks to create their own boards based on these SoCs, and so using the TI made EVM board name everywhere adds extra churn when adding a new board. Plus it is more correct for most of these features as they depend on the SoC, not on the EVM board. One other thing we do here is to not use the generic "j7" name, the current and future J7 devices are far to feature diverse to group at this level. Grouping like that will lead to the wrong things getting enabled as new J7 SoCs are added. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- .../recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 39 ++++++++++------------ 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb') diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 0447bafe..9a6da088 100644 --- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -13,13 +13,10 @@ inherit deploy inherit update-alternatives PLAT_SFX = "" -PLAT_SFX:j7 = "j721e" -PLAT_SFX:j721e-hs-evm = "j721e" -PLAT_SFX:j7200-evm = "j7200" -PLAT_SFX:j7200-hs-evm = "j7200" -PLAT_SFX:j721s2-evm = "j721s2" -PLAT_SFX:j721s2-hs-evm = "j721s2" -PLAT_SFX:j784s4-evm = "j784s4" +PLAT_SFX:j721e = "j721e" +PLAT_SFX:j7200 = "j7200" +PLAT_SFX:j721s2 = "j721s2" +PLAT_SFX:j784s4 = "j784s4" PLAT_SFX:am65xx = "am65xx" PLAT_SFX:am64xx = "am64xx" PLAT_SFX:am62xx = "am62xx" @@ -50,7 +47,7 @@ LEGACY_DM_FW_DIR = "${D}${nonarch_base_libdir}/firmware/pdk-ipc/" DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" -# J7 HS support +# J721e HS support do_install:prepend:j721e-hs-evm() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${RTOS_DM_FW_DIR}; \ @@ -81,7 +78,7 @@ do_install:prepend:j721e-hs-evm() { ) } -# J7 HS support +# J7200 HS support do_install:prepend:j7200-hs-evm() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${RTOS_DM_FW_DIR}; \ @@ -102,7 +99,7 @@ do_install:prepend:j7200-hs-evm() { ) } -# J7 HS support +# J721s2 HS support do_install:prepend:j721s2-hs-evm() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} ( cd ${RTOS_DM_FW_DIR}; \ @@ -149,7 +146,7 @@ do_install() { : } -do_install:j7() { +do_install:j721e() { install -d ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} @@ -335,7 +332,7 @@ ALTERNATIVE:${PN}:j721e-hs-evm = "\ j7-c71_0-fw-sec \ " -ALTERNATIVE:${PN}:j7 = "\ +ALTERNATIVE:${PN}:j721e-evm = "\ j7-mcu-r5f0_0-fw \ j7-mcu-r5f0_1-fw \ j7-main-r5f0_0-fw \ @@ -420,15 +417,15 @@ TARGET_MCU_M4FSS0_0:am64xx = "am64-mcu-m4f0_0-fw" TARGET_MAIN_R5FSS0_0:am62xx = "am62-main-r5f0_0-fw" TARGET_MCU_M4FSS0_0:am62xx = "am62-mcu-m4f0_0-fw" -TARGET_MCU_R5FSS0_0:j7 = "j7-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1:j7 = "j7-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0:j7 = "j7-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1:j7 = "j7-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0:j7 = "j7-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1:j7 = "j7-main-r5f1_1-fw" -TARGET_C66_0:j7 = "j7-c66_0-fw" -TARGET_C66_1:j7 = "j7-c66_1-fw" -TARGET_C7X_0:j7 = "j7-c71_0-fw" +TARGET_MCU_R5FSS0_0:j721e = "j7-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1:j721e = "j7-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0:j721e = "j7-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1:j721e = "j7-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0:j721e = "j7-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1:j721e = "j7-main-r5f1_1-fw" +TARGET_C66_0:j721e = "j7-c66_0-fw" +TARGET_C66_1:j721e = "j7-c66_1-fw" +TARGET_C7X_0:j721e = "j7-c71_0-fw" TARGET_MAIN_R5FSS0_0_SIGNED:j721e-hs-evm = "j7-main-r5f0_0-fw-sec" TARGET_MAIN_R5FSS0_1_SIGNED:j721e-hs-evm = "j7-main-r5f0_1-fw-sec" -- cgit v1.2.3-54-g00ecf