From aeec2fa76bf9327944c19ea81ae060687b30fde5 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 12 Sep 2023 18:32:29 +0000 Subject: ti-rtos-firmware: cleanup leftover alternative entries for Jacinto Jacinto platforms use first R5 MCU core for DM firmware. When DM firmware was split out into own recipe[1], ALTERNATIVE_TARGET entries got removed from ti-rtos-firmware recipe, but corresponding ALTERNATIVE_LINK_NAME entries remained, causing warnings. Clean up those now. [1] https://git.yoctoproject.org/meta-ti/commit/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb?id=b21d29d94694ac49b97a1f4ba428c7d8cd6fb64a Fixes these warnings: | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j7-mcu-r5f0_0-fw or /usr/lib/firmware/j7-mcu-r5f0_0-fw.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j7-mcu-r5f0_0-fw-sec or /usr/lib/firmware/j7-mcu-r5f0_0-fw-sec.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j7-mcu-r5f0_0-fw: /usr/lib/firmware/j7-mcu-r5f0_0-fw.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j7-mcu-r5f0_0-fw-sec: /usr/lib/firmware/j7-mcu-r5f0_0-fw-sec.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j7-mcu-r5f0_0-fw == /usr/lib/firmware/j7-mcu-r5f0_0-fw | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j7-mcu-r5f0_0-fw-sec == /usr/lib/firmware/j7-mcu-r5f0_0-fw-sec | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j7200-mcu-r5f0_0-fw or /usr/lib/firmware/j7200-mcu-r5f0_0-fw.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j7200-mcu-r5f0_0-fw-sec or /usr/lib/firmware/j7200-mcu-r5f0_0-fw-sec.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j7200-mcu-r5f0_0-fw: /usr/lib/firmware/j7200-mcu-r5f0_0-fw.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j7200-mcu-r5f0_0-fw-sec: /usr/lib/firmware/j7200-mcu-r5f0_0-fw-sec.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j7200-mcu-r5f0_0-fw == /usr/lib/firmware/j7200-mcu-r5f0_0-fw | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j7200-mcu-r5f0_0-fw-sec == /usr/lib/firmware/j7200-mcu-r5f0_0-fw-sec | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j721s2-mcu-r5f0_0-fw or /usr/lib/firmware/j721s2-mcu-r5f0_0-fw.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j721s2-mcu-r5f0_0-fw-sec or /usr/lib/firmware/j721s2-mcu-r5f0_0-fw-sec.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j721s2-mcu-r5f0_0-fw: /usr/lib/firmware/j721s2-mcu-r5f0_0-fw.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j721s2-mcu-r5f0_0-fw-sec: /usr/lib/firmware/j721s2-mcu-r5f0_0-fw-sec.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j721s2-mcu-r5f0_0-fw == /usr/lib/firmware/j721s2-mcu-r5f0_0-fw | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j721s2-mcu-r5f0_0-fw-sec == /usr/lib/firmware/j721s2-mcu-r5f0_0-fw-sec | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j784s4-mcu-r5f0_0-fw or /usr/lib/firmware/j784s4-mcu-r5f0_0-fw.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alternative target (/usr/lib/firmware/j784s4-mcu-r5f0_0-fw-sec or /usr/lib/firmware/j784s4-mcu-r5f0_0-fw-sec.ti-rtos-firmware) does not exist, skipping... | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j784s4-mcu-r5f0_0-fw: /usr/lib/firmware/j784s4-mcu-r5f0_0-fw.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: NOT adding alternative provide /usr/lib/firmware/j784s4-mcu-r5f0_0-fw-sec: /usr/lib/firmware/j784s4-mcu-r5f0_0-fw-sec.ti-rtos-firmware does not exist | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j784s4-mcu-r5f0_0-fw == /usr/lib/firmware/j784s4-mcu-r5f0_0-fw | WARNING: ti-rtos-firmware-08.02.00.04-r4.1 do_package: ti-rtos-firmware: alt_link == alt_target: /usr/lib/firmware/j784s4-mcu-r5f0_0-fw-sec == /usr/lib/firmware/j784s4-mcu-r5f0_0-fw-sec Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb | 12 ------------ 1 file changed, 12 deletions(-) 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 c560e7b4..751b10d6 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 @@ -128,7 +128,6 @@ ALTERNATIVE:${PN}:am62axx = "\ " ALTERNATIVE:${PN}:j721e = "\ - j7-mcu-r5f0_0-fw j7-mcu-r5f0_0-fw-sec \ j7-mcu-r5f0_1-fw j7-mcu-r5f0_1-fw-sec \ j7-main-r5f0_0-fw j7-main-r5f0_0-fw-sec \ j7-main-r5f0_1-fw j7-main-r5f0_1-fw-sec \ @@ -140,14 +139,12 @@ ALTERNATIVE:${PN}:j721e = "\ " ALTERNATIVE:${PN}:j7200 = "\ - j7200-mcu-r5f0_0-fw j7200-mcu-r5f0_0-fw-sec \ j7200-mcu-r5f0_1-fw j7200-mcu-r5f0_1-fw-sec \ j7200-main-r5f0_0-fw j7200-main-r5f0_0-fw-sec \ j7200-main-r5f0_1-fw j7200-main-r5f0_1-fw-sec \ " ALTERNATIVE:${PN}:j721s2 = "\ - j721s2-mcu-r5f0_0-fw j721s2-mcu-r5f0_0-fw-sec \ j721s2-mcu-r5f0_1-fw j721s2-mcu-r5f0_1-fw-sec \ j721s2-main-r5f0_0-fw j721s2-main-r5f0_0-fw-sec \ j721s2-main-r5f0_1-fw j721s2-main-r5f0_1-fw-sec \ @@ -158,7 +155,6 @@ ALTERNATIVE:${PN}:j721s2 = "\ " ALTERNATIVE:${PN}:j784s4 = "\ - j784s4-mcu-r5f0_0-fw j784s4-mcu-r5f0_0-fw-sec \ j784s4-mcu-r5f0_1-fw j784s4-mcu-r5f0_1-fw-sec \ j784s4-main-r5f0_0-fw j784s4-main-r5f0_0-fw-sec \ j784s4-main-r5f0_1-fw j784s4-main-r5f0_1-fw-sec \ @@ -200,8 +196,6 @@ ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmwar ALTERNATIVE_LINK_NAME[am62a-c71_0-fw] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw" ALTERNATIVE_LINK_NAME[am62a-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw-sec" -ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_0-fw" -ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_0-fw-sec" ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw" ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw-sec" ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw" @@ -219,8 +213,6 @@ ALTERNATIVE_LINK_NAME[j7-c66_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-c66 ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${nonarch_base_libdir}/firmware/j7-c71_0-fw" ALTERNATIVE_LINK_NAME[j7-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-c71_0-fw-sec" -ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_0-fw" -ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_0-fw-sec" ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_1-fw" ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_1-fw-sec" ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw" @@ -228,8 +220,6 @@ ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmwa ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_1-fw" ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_1-fw-sec" -ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw" -ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw-sec" ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_1-fw" ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_1-fw-sec" ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-main-r5f0_0-fw" @@ -245,8 +235,6 @@ ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7 ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw] = "${nonarch_base_libdir}/firmware/j721s2-c71_1-fw" ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j721s2-c71_1-fw-sec" -ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw" -ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw-sec" ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_1-fw" ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_1-fw-sec" ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw" -- cgit v1.2.3-54-g00ecf