From patchwork Tue Apr 25 17:23:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22982 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EEFDC6FD18 for ; Tue, 25 Apr 2023 17:23:49 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web10.86183.1682443428144076703 for ; Tue, 25 Apr 2023 10:23:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=cWGlSmZl; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNktl094302; Tue, 25 Apr 2023 12:23:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443426; bh=upCYcAoMURhjA4r3RrnkyJwsxYOrC/+6B6vocdus6bk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=cWGlSmZlv/VfTwtfRrbtvjAFcs/pJnyeO5l0RXNYCVdV/2OFx+cIdl2Ti0J5kvVsI pA8OMD/lIZka21cGQxtHxQuVEVMuINBjsYU2AHvc8f1zSty8JalwfjszI9ZaQ8wawi k5hHQniOR4eImQPw0KnTqATOO2tak/5mqmDgutcU= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNkEH090962 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:46 -0500 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:46 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 25 Apr 2023 12:23:46 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0o030178; Tue, 25 Apr 2023 12:23:46 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 1/9] ti-dm-fw: Add recipe for TI DM firmware Date: Tue, 25 Apr 2023 12:23:37 -0500 Message-ID: <20230425172345.12293-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16418 Split out the TI DM firmware from ti-rtos-firmware. Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb | 119 ++++++++++++++++++ .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 1 + meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +- .../ti-rtos-bin/ti-rtos-firmware.bb | 48 ------- 4 files changed, 121 insertions(+), 49 deletions(-) create mode 100644 meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb diff --git a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb new file mode 100644 index 00000000..8fb40d12 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb @@ -0,0 +1,119 @@ +SUMMARY = "TI DM prebuilt binary firmware images" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-ti/licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" + +COMPATIBLE_MACHINE = "k3" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit deploy +inherit update-alternatives + +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc + +PV = "${TI_DM_FW_VERSION}" +PR = "${INC_PR}.0" + +CLEANBROKEN = "1" + +# Secure Build +inherit ti-secdev + +PLAT_SFX = "" +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" +PLAT_SFX:am62axx = "am62axx" + +DM_FW_DIR = "ti-dm/${PLAT_SFX}" + +INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}" + +DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" + +DM_FW_LIST = "" +DM_FW_LIST:j721e = "${DM_FIRMWARE}" +DM_FW_LIST:j7200 = "${DM_FIRMWARE}" +DM_FW_LIST:j721s2 = "${DM_FIRMWARE}" +DM_FW_LIST:j784s4 = "${DM_FIRMWARE}" +DM_FW_LIST:am65xx = "" +DM_FW_LIST:am64xx = "" +DM_FW_LIST:am62xx = "${DM_FIRMWARE}" +DM_FW_LIST:am62axx = "${DM_FIRMWARE}" + +do_install() { + # Sign the firmware + # DM Firmware + for FW_NAME in ${DM_FW_LIST} + do + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${DM_FW_DIR}/${FW_NAME} ${S}/${DM_FW_DIR}/${FW_NAME}.signed + done + + # DM Firmware + install -d ${D}${INSTALL_DM_FW_DIR} + for FW_NAME in ${DM_FW_LIST} + do + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME} ${D}${INSTALL_DM_FW_DIR}/${FW_NAME}.unsigned + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_DM_FW_DIR}/${FW_NAME} + done +} + +do_deploy() { + # DM Firmware is needed for rebuilding U-Boot + install -d ${DEPLOYDIR} + for FW_NAME in ${DM_FW_LIST} + do + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME} ${DEPLOYDIR}/${FW_NAME}.unsigned + install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${DEPLOYDIR}/${FW_NAME} + done +} + +# Set up names for the firmwares +ALTERNATIVE:${PN}:am62xx = "am62-main-r5f0_0-fw" +ALTERNATIVE:${PN}:am62axx = "am62a-main-r5f0_0-fw" +ALTERNATIVE:${PN}:j721e = "j7-mcu-r5f0_0-fw" +ALTERNATIVE:${PN}:j7200 = "j7200-mcu-r5f0_0-fw" +ALTERNATIVE:${PN}:j721s2 = "j721s2-mcu-r5f0_0-fw" +ALTERNATIVE:${PN}:j784s4 = "j784s4-mcu-r5f0_0-fw" + +# Set up link names for the firmwares +ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[am62a-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62a-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7200-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw" + +# Create the firmware alternatives +ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[am62a-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" + +ALTERNATIVE_PRIORITY = "10" + +# make sure that lib/firmware, and all its contents are part of the package +FILES:${PN} += "${nonarch_base_libdir}/firmware" + +# This is used to prevent the build system to_strip the executables +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +# This is used to prevent the build system to split the debug info in a separate file +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP +INSANE_SKIP:${PN} += "arch" + +# we don't want to configure and build the source code +do_compile[noexec] = "1" +do_configure[noexec] = "1" + +addtask deploy after do_install diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index 1a5ea534..912ca63f 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -15,6 +15,7 @@ CADENCE_MHDP_FW_VERSION = "2.1.0" IMG_DEC_FW_VERSION = "1.0" CNM_WAVE521_FW_VERSION = "1.0.00" TIFS_LPM_STUB_FW_VERSION = "08.06.04" +TI_DM_FW_VERSION = "08.06.04" TI_LINUX_FW_SRCREV ?= "79c498ef6ab1558b699a2243a26c4a65a1c44d26" SRCREV = "${TI_LINUX_FW_SRCREV}" diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 8e236dfe..38ce5a58 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -39,7 +39,7 @@ PLAT_SFX:am62axx = "am62axx" PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os" -PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-rtos-firmware" +PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" PACKAGECONFIG:append:aarch64 = " atf optee" PACKAGECONFIG:append:j721e = " dm" 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 6bd85662..55f55ed5 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 @@ -33,16 +33,12 @@ CLEANBROKEN = "1" # Secure Build inherit ti-secdev -DM_FW_DIR = "ti-dm/${PLAT_SFX}" IPC_FW_DIR = "ti-ipc/${PLAT_SFX}" ETH_FW_DIR = "ti-eth/${PLAT_SFX}" -INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}" INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/${IPC_FW_DIR}" INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}" -DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" - MCU_1_0_FW = "ipc_echo_test_mcu1_0_release_strip.xer5f" MCU_1_1_FW = "ipc_echo_test_mcu1_1_release_strip.xer5f" MCU_2_0_FW = "ipc_echo_test_mcu2_0_release_strip.xer5f" @@ -60,16 +56,6 @@ C7X_4_FW = "ipc_echo_test_c7x_4_release_strip.xe71" ETH_FW = "app_remoteswitchcfg_server_strip.xer5f" -DM_FW_LIST = "" -DM_FW_LIST:j721e = "${DM_FIRMWARE}" -DM_FW_LIST:j7200 = "${DM_FIRMWARE}" -DM_FW_LIST:j721s2 = "${DM_FIRMWARE}" -DM_FW_LIST:j784s4 = "${DM_FIRMWARE}" -DM_FW_LIST:am65xx = "" -DM_FW_LIST:am64xx = "" -DM_FW_LIST:am62xx = "${DM_FIRMWARE}" -DM_FW_LIST:am62axx = "${DM_FIRMWARE}" - IPC_FW_LIST = "" IPC_FW_LIST:j721e = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}" IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}" @@ -116,13 +102,6 @@ do_install:prepend:am62axx() { } do_install() { - # Sign the firmware - # DM Firmware - for FW_NAME in ${DM_FW_LIST} - do - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${DM_FW_DIR}/${FW_NAME} ${S}/${DM_FW_DIR}/${FW_NAME}.signed - done - # IPC Firmware for FW_NAME in ${IPC_FW_LIST} do @@ -135,14 +114,6 @@ do_install() { ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed done - # DM Firmware - install -d ${D}${INSTALL_DM_FW_DIR} - for FW_NAME in ${DM_FW_LIST} - do - install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME} ${D}${INSTALL_DM_FW_DIR}/${FW_NAME}.unsigned - install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_DM_FW_DIR}/${FW_NAME} - done - # IPC Firmware install -d ${D}${INSTALL_IPC_FW_DIR} for FW_NAME in ${IPC_FW_LIST} @@ -160,16 +131,6 @@ do_install() { done } -do_deploy() { - # DM Firmware is needed for rebuilding U-Boot - install -d ${DEPLOYDIR} - for FW_NAME in ${DM_FW_LIST} - do - install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME} ${DEPLOYDIR}/${FW_NAME}.unsigned - install -m 0644 ${S}/${DM_FW_DIR}/${FW_NAME}.signed ${DEPLOYDIR}/${FW_NAME} - done -} - # Set up names for the firmwares ALTERNATIVE:${PN}:am65xx = "\ am65x-mcu-r5f0_0-fw \ @@ -265,7 +226,6 @@ ALTERNATIVE_LINK_NAME[am64-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/am ALTERNATIVE_LINK_NAME[am64-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/am64-main-r5f1_1-fw" ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am64-mcu-m4f0_0-fw" -ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw" ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw" ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62a-mcu-r5f0_0-fw" @@ -337,14 +297,11 @@ ALTERNATIVE_TARGET[am64-main-r5f1_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" ALTERNATIVE_TARGET[am64-main-r5f1_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}" -ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" -ALTERNATIVE_TARGET[am62a-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" -ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" @@ -362,7 +319,6 @@ ALTERNATIVE_TARGET[j7-c66_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C66_1_FW}.signed" ALTERNATIVE_TARGET[j7-c66_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C66_2_FW}.signed" ALTERNATIVE_TARGET[j7-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" -ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" @@ -370,7 +326,6 @@ ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" -ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" ALTERNATIVE_TARGET[j721s2-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" ALTERNATIVE_TARGET[j721s2-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" @@ -386,7 +341,6 @@ ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1 ALTERNATIVE_TARGET[j721s2-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" ALTERNATIVE_TARGET[j721s2-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed" -ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" ALTERNATIVE_TARGET[j784s4-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" @@ -415,5 +369,3 @@ INSANE_SKIP:${PN} += "arch" # we don't want to configure and build the source code do_compile[noexec] = "1" do_configure[noexec] = "1" - -addtask deploy after do_install From patchwork Tue Apr 25 17:23:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22981 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC001C77B78 for ; Tue, 25 Apr 2023 17:23:49 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.85703.1682443428180390360 for ; Tue, 25 Apr 2023 10:23:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=RKfemphB; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNlQZ052970; Tue, 25 Apr 2023 12:23:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443427; bh=hph8RGwL0tZy3SBuX5emc48efWcdQ54Kr3rhv/2YEoA=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=RKfemphBrOXkNt5l5UuhBF6MAb/tLBtcXHqxLDWoJhqL9KbrmhVN8qCOVC68EVaP4 WRlNbmwSXBmVuy85Td4vEDdPvV8a8pLG0UJMJqdECLbEdB/rI4Fx8mC9DH++T2c/Dx iHnpw7lw6NkVu+xh7aYvbPlmgc+xdEwyuidtHdms= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNlBO007693 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:47 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:47 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Tue, 25 Apr 2023 12:23:46 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0p030178; Tue, 25 Apr 2023 12:23:46 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 2/9] ti-eth-fw: Add recipe for TI Ethernet firmware Date: Tue, 25 Apr 2023 12:23:38 -0500 Message-ID: <20230425172345.12293-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16419 Split out the TI Ethernet firmware from ti-rtos-firmware. Signed-off-by: Andrew Davis --- .../recipes-bsp/ti-eth-fw/ti-eth-fw.bb | 118 ++++++++++++++++++ .../ti-rtos-bin/ti-rtos-firmware.bb | 38 +----- 2 files changed, 123 insertions(+), 33 deletions(-) create mode 100644 meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb diff --git a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb new file mode 100644 index 00000000..1a8d4aef --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb @@ -0,0 +1,118 @@ +SUMMARY = "TI Ethernet prebuilt binary firmware images" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-ti/licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" + +COMPATIBLE_MACHINE = "k3" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit deploy +inherit update-alternatives + +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc + +PV = "${CORESDK_RTOS_VERSION}" +PR = "${INC_PR}.0" + +CLEANBROKEN = "1" + +# Secure Build +inherit ti-secdev + +PLAT_SFX = "" +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" +PLAT_SFX:am62axx = "am62axx" + +ETH_FW_DIR = "ti-eth/${PLAT_SFX}" + +INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}" + +ETH_FW = "app_remoteswitchcfg_server_strip.xer5f" + +ETH_FW_LIST = "" +ETH_FW_LIST:j721e = "${ETH_FW}" +ETH_FW_LIST:j7200 = "${ETH_FW}" +ETH_FW_LIST:j721s2 = "" +ETH_FW_LIST:j784s4 = "${ETH_FW}" +ETH_FW_LIST:am65xx = "" +ETH_FW_LIST:am64xx = "" +ETH_FW_LIST:am62xx = "" +ETH_FW_LIST:am62axx = "" + +do_install() { + # ETH firmware + for FW_NAME in ${ETH_FW_LIST} + do + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed + done + + # ETH firmware + install -d ${D}${INSTALL_ETH_FW_DIR} + for FW_NAME in ${ETH_FW_LIST} + do + install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME} ${D}${INSTALL_ETH_FW_DIR} + install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_ETH_FW_DIR} + done +} + +# Set up names for the firmwares +ALTERNATIVE:${PN}:j721e = "\ + j7-main-r5f0_0-fw \ + j7-main-r5f0_0-fw-sec \ + " + +ALTERNATIVE:${PN}:j7200 = "\ + j7200-main-r5f0_0-fw \ + j7200-main-r5f0_0-fw-sec \ + " + +ALTERNATIVE:${PN}:j784s4 = "\ + j784s4-mcu-r5f0_0-fw \ + j784s4-mcu-r5f0_0-fw-sec \ + " + +# Set up link names for the firmwares +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw-sec" + +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-fw" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j7200-main-r5f0_0-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" + +# Create the firmware alternatives +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" + +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" + +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" + +ALTERNATIVE_PRIORITY = "20" + +# make sure that lib/firmware, and all its contents are part of the package +FILES:${PN} += "${nonarch_base_libdir}/firmware" + +# This is used to prevent the build system to_strip the executables +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +# This is used to prevent the build system to split the debug info in a separate file +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP +INSANE_SKIP:${PN} += "arch" + +# we don't want to configure and build the source code +do_compile[noexec] = "1" +do_configure[noexec] = "1" 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 55f55ed5..7958c0e6 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 @@ -1,4 +1,4 @@ -SUMMARY = "TI RTOS prebuilt binary firmware images" +SUMMARY = "TI Echo Test prebuilt binary firmware images" LICENSE = "TI-TFL" LIC_FILES_CHKSUM = "file://${COREBASE}/../meta-ti/licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" @@ -34,10 +34,8 @@ CLEANBROKEN = "1" inherit ti-secdev IPC_FW_DIR = "ti-ipc/${PLAT_SFX}" -ETH_FW_DIR = "ti-eth/${PLAT_SFX}" INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/${IPC_FW_DIR}" -INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}" MCU_1_0_FW = "ipc_echo_test_mcu1_0_release_strip.xer5f" MCU_1_1_FW = "ipc_echo_test_mcu1_1_release_strip.xer5f" @@ -54,8 +52,6 @@ C7X_2_FW = "ipc_echo_test_c7x_2_release_strip.xe71" C7X_3_FW = "ipc_echo_test_c7x_3_release_strip.xe71" C7X_4_FW = "ipc_echo_test_c7x_4_release_strip.xe71" -ETH_FW = "app_remoteswitchcfg_server_strip.xer5f" - IPC_FW_LIST = "" IPC_FW_LIST:j721e = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}" IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}" @@ -66,16 +62,6 @@ IPC_FW_LIST:am64xx = "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} $ IPC_FW_LIST:am62xx = " ${MCU_2_0_FW}" IPC_FW_LIST:am62axx = " ${MCU_2_0_FW} ${C7X_1_FW}" -ETH_FW_LIST = "" -ETH_FW_LIST:j721e = "${ETH_FW}" -ETH_FW_LIST:j7200 = "${ETH_FW}" -ETH_FW_LIST:j721s2 = "" -ETH_FW_LIST:j784s4 = "${ETH_FW}" -ETH_FW_LIST:am65xx = "" -ETH_FW_LIST:am64xx = "" -ETH_FW_LIST:am62xx = "" -ETH_FW_LIST:am62axx = "" - # Update the am64xx ipc binaries to be consistent with other platforms do_install:prepend:am64xx() { ( cd ${S}/${IPC_FW_DIR}; \ @@ -108,12 +94,6 @@ do_install() { ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${IPC_FW_DIR}/${FW_NAME} ${S}/${IPC_FW_DIR}/${FW_NAME}.signed done - # ETH firmware - for FW_NAME in ${ETH_FW_LIST} - do - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed - done - # IPC Firmware install -d ${D}${INSTALL_IPC_FW_DIR} for FW_NAME in ${IPC_FW_LIST} @@ -121,14 +101,6 @@ do_install() { install -m 0644 ${S}/${IPC_FW_DIR}/${FW_NAME} ${D}${INSTALL_IPC_FW_DIR} install -m 0644 ${S}/${IPC_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_IPC_FW_DIR} done - - # ETH firmware - install -d ${D}${INSTALL_ETH_FW_DIR} - for FW_NAME in ${ETH_FW_LIST} - do - install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME} ${D}${INSTALL_ETH_FW_DIR} - install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_ETH_FW_DIR} - done } # Set up names for the firmwares @@ -303,7 +275,7 @@ ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" -ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" ALTERNATIVE_TARGET[j7-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" ALTERNATIVE_TARGET[j7-main-r5f1_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}" ALTERNATIVE_TARGET[j7-main-r5f1_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}" @@ -311,7 +283,7 @@ ALTERNATIVE_TARGET[j7-c66_0-fw] = "${INSTALL_IPC_FW_DIR}/${C66_1_FW}" ALTERNATIVE_TARGET[j7-c66_1-fw] = "${INSTALL_IPC_FW_DIR}/${C66_2_FW}" ALTERNATIVE_TARGET[j7-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" -ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" ALTERNATIVE_TARGET[j7-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" ALTERNATIVE_TARGET[j7-main-r5f1_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed" ALTERNATIVE_TARGET[j7-main-r5f1_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}.signed" @@ -320,10 +292,10 @@ ALTERNATIVE_TARGET[j7-c66_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C66_2_FW}.signed" ALTERNATIVE_TARGET[j7-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" -ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}" -ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed" ALTERNATIVE_TARGET[j721s2-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" From patchwork Tue Apr 25 17:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22980 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACFF0C77B7F for ; Tue, 25 Apr 2023 17:23:49 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web11.85704.1682443428533991621 for ; Tue, 25 Apr 2023 10:23:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=g0B4C0U2; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNlWP094307; Tue, 25 Apr 2023 12:23:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443427; bh=CcwkgKg82bGdFJv4MfCwxGbxOQKX9NAUKIxSMUb3Fj8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=g0B4C0U2M1cjF1YnJAf3xF5+deJwTaPXtEjkI49ECMfdWD5o0+6ne3p4LLd8T5EBU 9/ae1JOPDL+qjKRZMZGGnwehQ/NcYm8lMnPdaxbTj9Zx4pUAtxW+7z95QeArDq+Z0X BPjLTfTyRKZx5q3ZtbswQxDsARZjQPLyEc1WUkP0= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNl4o007703 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:47 -0500 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:47 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 25 Apr 2023 12:23:47 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0q030178; Tue, 25 Apr 2023 12:23:46 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 3/9] ti-sci-fw: Remove source package recipe Date: Tue, 25 Apr 2023 12:23:39 -0500 Message-ID: <20230425172345.12293-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16420 K3-image-gen is going away and we don't do SRCIPK packages like this anymore anyway. Remove this recipe. Signed-off-by: Andrew Davis --- .../ti-sci-fw/ti-sci-fw-source_git.bb | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb deleted file mode 100644 index bab4acf0..00000000 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb +++ /dev/null @@ -1,45 +0,0 @@ -# ti-sci-fw builds and packages multiple config variants via multiconfig -# Let's take a page from gcc-source as a common recipe for all gcc stages, -# but also to provide a single package for MAINMACHINE of all multiconfigs - -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -SUMMARY += "- sources" - -COMPATIBLE_MACHINE = "k3" - -EXCLUDE_FROM_WORLD = "1" -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "" - -PACKAGES = "${PN}" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -SRCIPK_SRC_DIR = "${WORKDIR}/imggen" -SRCIPK_INSTALL_DIR = "board-support/k3-image-gen-${PV}" -FILES:${PN} = "${SRCIPK_INSTALL_DIR}" - -do_install() { - # Copy sources for packaging - mkdir -p ${D}/${SRCIPK_INSTALL_DIR} - if [ -e ${SRCIPK_SRC_DIR} ]; then - if [ "${SRCIPK_SRC_DIR}" = "${WORKDIR}" ]; then - excludes='--exclude ./temp --exclude ${D}' - fi - tar -C ${SRCIPK_SRC_DIR} -cO $excludes . | tar -C ${D}/${SRCIPK_INSTALL_DIR} -xpf - - fi - - # Fix up patches/ directory to contain actual patches instead of symlinks - if [ -e ${D}/${SRCIPK_INSTALL_DIR}/patches ] - then - mv ${D}/${SRCIPK_INSTALL_DIR}/patches ${D}/${SRCIPK_INSTALL_DIR}/patches-links - cp -rL ${D}/${SRCIPK_INSTALL_DIR}/patches-links ${D}/${SRCIPK_INSTALL_DIR}/patches - rm -rf ${D}/${SRCIPK_INSTALL_DIR}/patches-links - fi -} - -# Do not perform any QA checks on source package -INSANE_SKIP:${PN} += "${ALL_QA}" From patchwork Tue Apr 25 17:23:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22979 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C4F1C77B61 for ; Tue, 25 Apr 2023 17:23:49 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.85706.1682443428991527119 for ; Tue, 25 Apr 2023 10:23:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=CP9d1xwC; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNmZF052974; Tue, 25 Apr 2023 12:23:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443428; bh=OMfDrPnpLYQK0xzjeONNzWT/5WzlTrkfQ4Nt+Wet8fI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=CP9d1xwC1NqeVEbg4Jw38yIs8yqOs+3IAPl2ArJPzXI1VbxQ4be+9O+mQARguqplT 2UM1DozbZW/lDH5c5YJo3+6YMNUFJVJKZcCvAwbeEut/wwBlpumsTTgKsrSJ6sfy4I ITqkLWR3f0ElGT7NjRyqMIxTOTnTf09i5mMEofwc= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNmvx031722 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:48 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:47 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 25 Apr 2023 12:23:47 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0r030178; Tue, 25 Apr 2023 12:23:47 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe Date: Tue, 25 Apr 2023 12:23:40 -0500 Message-ID: <20230425172345.12293-5-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:49 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16422 This will no longer build after we switch away from k3-image-gen. Remove this version until it can be rebased on the latest U-Boot with binman support. For now switch current users of this over to u-boot-ti v2021.01. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/beagle-x15.conf | 2 -- .../conf/machine/beaglebone-ai64-k3r5.conf | 3 --- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 2 -- meta-ti-bsp/conf/machine/beaglebone.conf | 2 -- meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 3 --- meta-ti-bsp/conf/machine/beagleplay.conf | 2 -- .../recipes-bsp/u-boot/u-boot-bb.org_git.bb | 24 ------------------- 7 files changed, 38 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index fb52245b..be27705c 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -5,8 +5,6 @@ require conf/machine/include/am57xx.inc PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf index 7c99b5d4..b893f380 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -4,9 +4,6 @@ require conf/machine/include/k3r5.inc -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" - SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf index 304cbb62..bd5f541f 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf @@ -7,8 +7,6 @@ require conf/machine/include/j721e.inc UBOOT_MACHINE = "j721e_evm_a72_config" PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" KERNEL_DEVICETREE = " \ ti/k3-j721e-beagleboneai64.dtb \ diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index dceef1db..2d811d0d 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -5,8 +5,6 @@ require conf/machine/include/ti33x.inc PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" KERNEL_DEVICETREE_PREFIX = "am335x-bone" diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf index c40615c9..f8f08d63 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -4,9 +4,6 @@ require conf/machine/include/k3r5.inc -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" - SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index e8d25cd9..f4f6a49c 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -20,8 +20,6 @@ OPTEEMACHINE = "k3-am62x" UBOOT_MACHINE = "am62x_evm_a53_defconfig" PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" KERNEL_DEVICETREE = " \ ti/k3-am625-beagleplay.dtb \ diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb deleted file mode 100644 index 4e4688aa..00000000 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -require u-boot-ti.inc - -SUMMARY = "BeagleBoard.org U-Boot" - -COMPATIBLE_MACHINE = "beagle.*" - -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" - -PV = "2021.01" - -UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" -UBOOT_GIT_PROTOCOL = "https" -BRANCH = "v2021.01-ti-08.05.00.005-SDK-8.5" -SRCREV = "46ff4982b41067e5c93369bddd49b1541856d80b" - -BRANCH:beaglebone-ai64 = "v2021.01-ti-08.05.00.001" -BRANCH:beaglebone-ai64-k3r5 = "v2021.01-ti-08.05.00.001" -SRCREV:beaglebone-ai64 = "ea96725b5156135d5875415f75d2188f6f56622a" -SRCREV:beaglebone-ai64-k3r5 = "ea96725b5156135d5875415f75d2188f6f56622a" - -BRANCH:beagleplay = "v2021.01-ti-BeaglePlay-Release" -BRANCH:beagleplay-k3r5 = "v2021.01-ti-BeaglePlay-Release" -SRCREV:beagleplay = "f036fbdc25941d7585182d2552c767edb9b04114" -SRCREV:beagleplay-k3r5 = "f036fbdc25941d7585182d2552c767edb9b04114" From patchwork Tue Apr 25 17:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22984 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76D87C77B61 for ; Tue, 25 Apr 2023 17:23:59 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.86185.1682443429412350333 for ; Tue, 25 Apr 2023 10:23:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=Jv6Mig6p; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNmVH052987; Tue, 25 Apr 2023 12:23:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443428; bh=7j+zE7Gev+FhVonAVu79wE0gcqYgYyp23r3Q4Q0g8dw=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Jv6Mig6pYKkKbzEVJ0otL4XbYqz40qhWzkDkNfHIuO3iBVYSqXG7Shty/8gGJxiLW /66kZ+RhUTmR2x0gf7aVkAV2YCTFqsnSLnu5mOD4xvkn4QPSjKyr3AnXJLOnyCMpaM z44unR1qFqd4bdITynJq9spzMn95QMf9brkrAjAw= Received: from DFLE107.ent.ti.com (dfle107.ent.ti.com [10.64.6.28]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNmru123167 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:48 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:48 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 25 Apr 2023 12:23:48 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0s030178; Tue, 25 Apr 2023 12:23:47 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 5/9] u-boot-ti-staging: Remove version 2021.01 Date: Tue, 25 Apr 2023 12:23:41 -0500 Message-ID: <20230425172345.12293-6-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16423 This will no longer build after we switch away from k3-image-gen. Remove this version and make 2023.04 the default. Signed-off-by: Andrew Davis --- ...e-to-support-oe-core-fitImage-naming.patch | 144 ------------------ .../u-boot/u-boot-ti-staging_2021.01.bb | 15 -- .../u-boot/u-boot-ti-staging_2023.04.bb | 2 - 3 files changed, 161 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch deleted file mode 100644 index 9a832312..00000000 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 33c4b7335a39c48507a254505169df59c7a69c75 Mon Sep 17 00:00:00 2001 -From: Ryan Eatmon -Date: Thu, 23 Mar 2023 10:29:40 -0500 -Subject: [PATCH] configs: Update to support oe-core fitImage naming - -In kirkstone and forward, the values in the fitImage have been -standardized to include both conf- and the vender subdir in the name of -the dtbs. This patch updates u-boot to support that. - -Signed-off-by: Ryan Eatmon ---- - include/configs/am62x_evm.h | 6 +++--- - include/configs/am64x_evm.h | 4 ++-- - include/configs/am65x_evm.h | 2 +- - include/configs/j721e_evm.h | 8 ++++---- - include/configs/j721s2_evm.h | 6 +++--- - include/configs/j784s4_evm.h | 6 +++--- - include/configs/ti_armv7_common.h | 2 +- - 7 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h -index 97bd7c1fd7..6d957c906b 100644 ---- a/include/configs/am62x_evm.h -+++ b/include/configs/am62x_evm.h -@@ -122,11 +122,11 @@ - #define EXTRA_ENV_AM625_BOARD_SETTINGS \ - "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "findfdt=" \ -- "setenv name_fdt ${default_device_tree};" \ -+ "setenv name_fdt ti_${default_device_tree};" \ - "if test $board_name = am62x_skevm; then " \ -- "setenv name_fdt k3-am625-sk.dtb; fi;" \ -+ "setenv name_fdt ti_k3-am625-sk.dtb; fi;" \ - "if test $board_name = am62x_lp_skevm; then " \ -- "setenv name_fdt k3-am62x-lp-sk.dtb; fi;" \ -+ "setenv name_fdt ti_k3-am62x-lp-sk.dtb; fi;" \ - "setenv fdtfile ${name_fdt}\0" \ - "name_kern=Image\0" \ - "console=ttyS2,115200n8\0" \ -diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h -index 33ba5da31f..d32b488b58 100644 ---- a/include/configs/am64x_evm.h -+++ b/include/configs/am64x_evm.h -@@ -107,9 +107,9 @@ - #define EXTRA_ENV_AM642_BOARD_SETTINGS \ - "findfdt=" \ - "if test $board_name = am64x_gpevm; then " \ -- "setenv fdtfile k3-am642-evm.dtb; fi; " \ -+ "setenv fdtfile ti_k3-am642-evm.dtb; fi; " \ - "if test $board_name = am64x_skevm; then " \ -- "setenv fdtfile k3-am642-sk.dtb; fi;" \ -+ "setenv fdtfile ti_k3-am642-sk.dtb; fi;" \ - "if test $fdtfile = undefined; then " \ - "echo WARNING: Could not determine device tree to use; fi; \0" \ - "name_kern=Image\0" \ -diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h -index c78e4c4493..07d234d5d3 100644 ---- a/include/configs/am65x_evm.h -+++ b/include/configs/am65x_evm.h -@@ -64,7 +64,7 @@ - /* U-Boot general configuration */ - #define EXTRA_ENV_AM65X_BOARD_SETTINGS \ - "findfdt=" \ -- "setenv name_fdt k3-am654-base-board.dtb;" \ -+ "setenv name_fdt ti_k3-am654-base-board.dtb;" \ - "setenv fdtfile ${name_fdt}\0" \ - "name_kern=Image\0" \ - "console=ttyS2,115200n8\0" \ -diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h -index 50b018b6ed..ad11494bd0 100644 ---- a/include/configs/j721e_evm.h -+++ b/include/configs/j721e_evm.h -@@ -77,13 +77,13 @@ - #define EXTRA_ENV_J721E_BOARD_SETTINGS \ - "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "findfdt=" \ -- "setenv name_fdt ${default_device_tree};" \ -+ "setenv name_fdt ti_${default_device_tree};" \ - "if test $board_name = J721EX-PM1-SOM; then " \ -- "setenv name_fdt k3-j721e-proc-board-tps65917.dtb; fi;" \ -+ "setenv name_fdt ti_k3-j721e-proc-board-tps65917.dtb; fi;" \ - "if test $board_name = j721e; then " \ -- "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \ -+ "setenv name_fdt ti_k3-j721e-common-proc-board.dtb; fi;" \ - "if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \ -- "setenv name_fdt k3-j721e-sk.dtb; fi;" \ -+ "setenv name_fdt ti_k3-j721e-sk.dtb; fi;" \ - "setenv fdtfile ${name_fdt}\0" \ - "name_kern=Image\0" \ - "console=ttyS2,115200n8\0" \ -diff --git a/include/configs/j721s2_evm.h b/include/configs/j721s2_evm.h -index 2d26eb544d..4b4d4a6e37 100644 ---- a/include/configs/j721s2_evm.h -+++ b/include/configs/j721s2_evm.h -@@ -66,11 +66,11 @@ - #define EXTRA_ENV_J721S2_BOARD_SETTINGS \ - "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "findfdt=" \ -- "setenv name_fdt ${default_device_tree};" \ -+ "setenv name_fdt ti_${default_device_tree};" \ - "if test $board_name = j721s2; then " \ -- "setenv name_fdt k3-j721s2-common-proc-board.dtb; fi;" \ -+ "setenv name_fdt ti_k3-j721s2-common-proc-board.dtb; fi;" \ - "if test $board_name = am68-sk; then " \ -- "setenv name_fdt k3-am68-sk-base-board.dtb; fi;"\ -+ "setenv name_fdt ti_k3-am68-sk-base-board.dtb; fi;"\ - "setenv fdtfile ${name_fdt}\0" \ - "name_kern=Image\0" \ - "console=ttyS2,115200n8\0" \ -diff --git a/include/configs/j784s4_evm.h b/include/configs/j784s4_evm.h -index eb609100b0..30820ea1c6 100644 ---- a/include/configs/j784s4_evm.h -+++ b/include/configs/j784s4_evm.h -@@ -67,11 +67,11 @@ - #define EXTRA_ENV_J784S4_BOARD_SETTINGS \ - "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "findfdt=" \ -- "setenv name_fdt ${default_device_tree};" \ -+ "setenv name_fdt ti_${default_device_tree};" \ - "if test $board_name = am69-sk; then " \ -- "setenv name_fdt k3-am69-sk.dtb; fi;" \ -+ "setenv name_fdt ti_k3-am69-sk.dtb; fi;" \ - "if test $board_name = j784s4; then " \ -- "setenv name_fdt k3-j784s4-evm.dtb; fi;" \ -+ "setenv name_fdt ti_k3-j784s4-evm.dtb; fi;" \ - "setenv fdtfile ${name_fdt}\0" \ - "name_kern=Image\0" \ - "console=ttyS2,115200n8\0" \ -diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index c48c4c2398..29de095729 100644 ---- a/include/configs/ti_armv7_common.h -+++ b/include/configs/ti_armv7_common.h -@@ -68,7 +68,7 @@ - "do;" \ - "setenv overlaystring ${overlaystring}'#'${overlay};" \ - "done;\0" \ -- "run_fit=bootm ${addr_fit}#${fdtfile}${overlaystring}\0" \ -+ "run_fit=bootm ${addr_fit}#conf-${fdtfile}${overlaystring}\0" \ - - /* - * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, --- -2.17.1 - diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb deleted file mode 100644 index 7529ce6c..00000000 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb +++ /dev/null @@ -1,15 +0,0 @@ - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:" - -require u-boot-ti.inc - -LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" - -PR = "r34" - -BRANCH = "ti-u-boot-2021.01" - -SRCREV = "2ee8efd6543648c6b8a14d93d52a6038854035c8" - -SRC_URI += "file://0001-configs-Update-to-support-oe-core-fitImage-naming.patch" - diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb index 6a46e812..c7006717 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb @@ -7,5 +7,3 @@ PR = "r0" BRANCH = "ti-u-boot-2023.04" SRCREV = "41a88ad529b3943b1e465846eb24fe2c29203e35" - -DEFAULT_PREFERENCE = "-1" From patchwork Tue Apr 25 17:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22985 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87AC0C77B7C for ; Tue, 25 Apr 2023 17:23:59 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.85708.1682443429836431023 for ; Tue, 25 Apr 2023 10:23:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=XjbYMcAy; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNmnp052991; Tue, 25 Apr 2023 12:23:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443429; bh=DHF/Z88IfhNPF4FjNv3d96U9m35Fbplrggy2wzJ2FdM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=XjbYMcAyNctuTOqDJ8Xqc2m26/ygY0RueVR/saILqqMyTzVrpKzRT2qyYY0rkStxV uWApinLpMVw98XnQMVVSbA3AUS63cdmOVybosJdQMuv+k782sv0uQywiFcYXdQtyLv gF2f50wOR2/zksxslaVn1yEo4kxj1iwyF6hbaQAA= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNmHK031732 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:48 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:49 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Tue, 25 Apr 2023 12:23:48 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0t030178; Tue, 25 Apr 2023 12:23:48 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 6/9] ti-sci-fw: Drop k3-image-gen and only provide firmware Date: Tue, 25 Apr 2023 12:23:42 -0500 Message-ID: <20230425172345.12293-7-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16424 This converts ti-sci-fw into a standard firmware provider package. We do not need to do anything additional here with that firmware as U-Boot now does that for us with binman. Signed-off-by: Andrew Davis --- .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 14 +- .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 144 ++---------------- 2 files changed, 12 insertions(+), 146 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index 912ca63f..f42b5210 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -1,4 +1,4 @@ -SUMMARY = "TI SCI firmware (SYSFW)" +SUMMARY = "Common include for TI Linux firmware" LICENSE = "TI-TFL" LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" @@ -16,21 +16,13 @@ IMG_DEC_FW_VERSION = "1.0" CNM_WAVE521_FW_VERSION = "1.0.00" TIFS_LPM_STUB_FW_VERSION = "08.06.04" TI_DM_FW_VERSION = "08.06.04" +TI_SYSFW_VERSION = "08.06.04" TI_LINUX_FW_SRCREV ?= "79c498ef6ab1558b699a2243a26c4a65a1c44d26" SRCREV = "${TI_LINUX_FW_SRCREV}" BRANCH ?= "ti-linux-firmware" -K3_IMAGE_GEN_SRCREV ?= "1319f46f3899e62d88e0a5cedad5b454d0432ddb" -SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}" -SRCREV_FORMAT = "imggen" - -K3_IMAGE_GEN_BRANCH ?= "master" - -SRC_URI = " \ - git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH} \ - git://git.ti.com/git/k3-image-gen/k3-image-gen.git;protocol=https;branch=${K3_IMAGE_GEN_BRANCH};destsuffix=imggen;name=imggen \ -" +SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index cde768df..6a4c03f9 100644 --- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -1,149 +1,23 @@ -require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" -DEPENDS:remove:am65xx-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:am65xx-evm-k3r5-sr2 = "virtual/bootloader" -DEPENDS:remove:am65xx-hs-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:am65xx-hs-evm-k3r5-sr2 = "virtual/bootloader" -DEPENDS:remove:j721e-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:j721e-hs-evm-k3r5 = "virtual/bootloader" -DEPENDS:remove:j721e-hs-evm-k3r5-sr1-1 = "virtual/bootloader" -DEPENDS:remove:beaglebone-ai64-k3r5 = "virtual/bootloader" - -CLEANBROKEN = "1" -PR = "${INC_PR}.2" +SUMMARY = "TI SYSFW/TIFS Firmware" -# Loaded by R5F core -COMPATIBLE_MACHINE = "k3r5" -COMPATIBLE_MACHINE:aarch64 = "null" +require recipes-bsp/ti-linux-fw/ti-linux-fw.inc PACKAGE_ARCH = "${MACHINE_ARCH}" -# Use TI SECDEV for signing -inherit ti-secdev - -SYSFW_SOC ?= "unknown" -SYSFW_SUFFIX ?= "unknown" -SYSFW_CONFIG ?= "unknown" - -SYSFW_PREFIX = "sci" -SYSFW_PREFIX:j721e-evm-k3r5 = "fs" -SYSFW_PREFIX:j721e-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs" -SYSFW_PREFIX:beaglebone-ai64-k3r5 = "fs" -SYSFW_PREFIX:j7200-evm-k3r5 = "fs" -SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:j721s2-evm-k3r5-gp = "fs" -SYSFW_PREFIX:j721s2-evm-k3r5-sr1-hs-fs = "fs" -SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:j784s4-evm-k3r5-gp = "fs" -SYSFW_PREFIX:j784s4-evm-k3r5-sr1-hs-fs = "fs" -SYSFW_PREFIX:j784s4-hs-evm-k3r5 = "fs" -SYSFW_PREFIX:am62xx-evm-k3r5-gp = "fs" -SYSFW_PREFIX:am62xx-evm-k3r5-hs-se = "fs" -SYSFW_PREFIX:am62xx-evm-k3r5-hs-fs = "fs" -SYSFW_PREFIX:beagleplay-k3r5 = "fs" -SYSFW_PREFIX:am62xx-lp-evm-k3r5 = "fs" -SYSFW_PREFIX:am62xx-lp-evm-k3r5-hs-se = "fs" -SYSFW_PREFIX:am62xx-lp-evm-k3r5-hs-fs = "fs" -SYSFW_PREFIX:am62axx-evm-k3r5-gp = "fs" -SYSFW_PREFIX:am62axx-evm-k3r5-hs-fs = "fs" -SYSFW_PREFIX:am62axx-evm-k3r5-hs-se = "fs" - -SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" - -SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin" -SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin" - -SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" -SYSFW_SYMLINK ?= "sysfw.itb" - -SYSFW_VBINARY:am65xx-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY:am65xx-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY:am65xx-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY:am65xx-hs-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY:j721e-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY:j721e-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" - -SYSFW_IMAGE:am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE:am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE:am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE:am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE:j721e-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE:j721e-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE:j721e-hs-evm-k3r5-sr1-1 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" - CFLAGS[unexport] = "1" LDFLAGS[unexport] = "1" AS[unexport] = "1" LD[unexport] = "1" -do_configure[noexec] = "1" - -EXTRA_OEMAKE = "\ - CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \ - CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \ - SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin" \ -" -EXTRA_OEMAKE:remove:am65xx-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:am65xx-evm-k3r5-sr2 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:am65xx-hs-evm-k3r5-sr2 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:j721e-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:j721e-hs-evm-k3r5-sr1-1 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" -EXTRA_OEMAKE:remove:beaglebone-ai64-k3r5 = "SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +PV = "${TI_SYSFW_VERSION}" +PR = "${INC_PR}.0" -do_compile() { - cd ${WORKDIR}/imggen/ - oe_runmake -} +CLEANBROKEN = "1" do_install() { - install -d ${D}/boot - - if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY} - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK} - fi - fi - - if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then - install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3} - if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then - ln -sf ${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3_SYMLINK} - fi - fi -} - -FILES:${PN} = "/boot" - -inherit deploy - -do_deploy () { - install -d ${DEPLOYDIR} - - if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY} - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ - fi - fi - - if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then - install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} - if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then - ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK} - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ - fi - fi + install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw + install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${D}${nonarch_base_libdir}/firmware/ti-sysfw } -addtask deploy before do_build after do_compile +FILES:${PN} = "${nonarch_base_libdir}/firmware" From patchwork Tue Apr 25 17:23:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22983 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87AF0C77B7F for ; Tue, 25 Apr 2023 17:23:59 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web10.86187.1682443431381674240 for ; Tue, 25 Apr 2023 10:23:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=Ky0kfIUI; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNnX0099815; Tue, 25 Apr 2023 12:23:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443429; bh=s+TYzatax+5SVmiLNHh3+ZeBC78sBbBrpET8mQ51ahk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Ky0kfIUICG6qy1+YGH6EyYIAp1ehnK6ZZBKXqJSNFXeQltl05fT7KgXF2/6AeW4kG WvEvheCUtDMKV4QN0OMIukHSRhLzgNSdMp7JhdYlOahoIky0X1g408bRuImz6B/uxA W3meHbdIcgJQRfiksFdt5oWexx/SyjR8EaFdQOnA= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNnbr007725 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:49 -0500 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:49 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 25 Apr 2023 12:23:49 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0u030178; Tue, 25 Apr 2023 12:23:48 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 7/9] u-boot-ti-staging: Use binman to package our firmware Date: Tue, 25 Apr 2023 12:23:43 -0500 Message-ID: <20230425172345.12293-8-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16425 Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc index 38ce5a58..c7fab71f 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -25,6 +25,12 @@ PV:append = "+git${SRCPV}" # u-boot needs devtree compiler to parse dts files DEPENDS += "dtc-native bc-native lzop-native flex-native bison-native python3-setuptools-native" +# u-boot needs these for binman +DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-native" + +# SYSFW/TIFS Firmware +DEPENDS:append:k3 = " ti-sci-fw" + DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" PLAT_SFX = "" @@ -37,7 +43,7 @@ PLAT_SFX:am64xx = "am64xx" PLAT_SFX:am62xx = "am62xx" PLAT_SFX:am62axx = "am62axx" -PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" +PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os" PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" @@ -51,7 +57,9 @@ PACKAGECONFIG:append:am62axx = " dm" COMPATIBLE_MACHINE = "(ti-soc)" -EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" +BINMAN_INDIRS="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware" + +EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}" PROVIDES += "u-boot" PKG:${PN} = "u-boot" From patchwork Tue Apr 25 17:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22986 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79BB8C77B78 for ; Tue, 25 Apr 2023 17:23:59 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web11.85709.1682443431964399253 for ; Tue, 25 Apr 2023 10:23:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=lJI5dzPy; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNpHi052997; Tue, 25 Apr 2023 12:23:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443431; bh=L408On+uBZQZYQxPsZQAE1Eh3ePXJajyc0dyAkbwCmE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=lJI5dzPyqw1o+To9k38yUpp241+Bu5sjPx8l2hSdvsgcfi1bNoWHwilxAWGKZYRln VLkd3RU6GGRe/x93xlhO7Kl3estaz45GkDzFv6u0R/a8My9WEct0taSIvuOaFxQ6RL dXRbQG2EmY/52EVNJ/RZHGvcjpxIALXu0rsYe9KY= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNojM123189 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:51 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:49 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 25 Apr 2023 12:23:49 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0v030178; Tue, 25 Apr 2023 12:23:49 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 8/9] conf: machine: Switch all the machines over to U-Boot binman Date: Tue, 25 Apr 2023 12:23:44 -0500 Message-ID: <20230425172345.12293-9-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16426 Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf | 12 ++++++++++++ meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 11 +++++++++++ meta-ti-bsp/conf/machine/am62xx-evm.conf | 4 ++-- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 7 ------- meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf | 12 ++++++++++++ meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 7 ------- meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf | 7 ------- meta-ti-bsp/conf/machine/include/am62axx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am62xx-lp.inc | 4 ---- meta-ti-bsp/conf/machine/include/am62xx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am64xx.inc | 6 ------ meta-ti-bsp/conf/machine/include/am65xx.inc | 5 ----- meta-ti-bsp/conf/machine/include/j721e.inc | 3 --- meta-ti-bsp/conf/machine/include/k3.inc | 2 +- meta-ti-bsp/conf/machine/include/k3r5.inc | 5 ++++- meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 6 ------ meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 6 ------ meta-ti-bsp/conf/machine/j721s2-evm.conf | 4 ---- meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 2 -- meta-ti-bsp/conf/machine/j784s4-evm.conf | 4 ---- meta-ti-bsp/conf/machine/j784s4-hs-evm.conf | 2 -- 21 files changed, 42 insertions(+), 79 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf new file mode 100644 index 00000000..80b6497f --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM62A HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62A EVM (R5F core) + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":k3r5-hs-fs" + +SYSFW_SOC = "am62ax" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62ax_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf new file mode 100644 index 00000000..724a8d4a --- /dev/null +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM62XX EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index d54213d4..5b86a1f5 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -12,6 +12,6 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "am62x_evm_a53_defconfig" -SPL_BINARY = "tispl.bin_HS" -UBOOT_BINARY = "u-boot.img_HS" +SPL_BINARY = "tispl.bin" +UBOOT_BINARY = "u-boot.img" UBOOT_SYMLINK = "u-boot.img" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf index 15ecc677..54059dd7 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -9,11 +9,4 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SYSFW_TIBOOT3_SYMLINK = "" - UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf new file mode 100644 index 00000000..4369becc --- /dev/null +++ b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM64xx EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) + +require conf/machine/include/k3r5.inc +SOC_FAMILY:append = ":am64xx" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index a484e444..b1b2490e 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -7,12 +7,5 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SYSFW_SYMLINK = "" - -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf index d9041c9d..836460e9 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf @@ -7,12 +7,5 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc index eacfa584..5cc95585 100644 --- a/meta-ti-bsp/conf/machine/include/am62axx.inc +++ b/meta-ti-bsp/conf/machine/include/am62axx.inc @@ -6,18 +6,12 @@ MACHINE_FEATURES += "screen touchscreen" TFA_K3_SYSTEM_SUSPEND = "1" # Default tiboot3.bin on AM62A is for HS-FS -BBMULTICONFIG = "k3r5-hs-fs" -do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE -BBMULTICONFIG += "k3r5-hs-se" IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc index bcc6f493..3c0249eb 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx-lp.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx-lp.inc @@ -6,13 +6,9 @@ MACHINE_FEATURES += "screen touchscreen" TFA_K3_SYSTEM_SUSPEND = "1" # Default tiboot3.bin on AM62x LP is for HS-FS -BBMULTICONFIG = "k3r5-hs-fs" -do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE -BBMULTICONFIG += "k3r5-hs-se" IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" OPTEEMACHINE = "k3-am62x" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 623d90eb..cb8db03f 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -6,18 +6,12 @@ MACHINE_FEATURES += "screen gpu" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" # Default tiboot3.bin on AM62x is for HS-FS -BBMULTICONFIG = "k3r5-hs-fs" -do_image_complete[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE -BBMULTICONFIG += "k3r5-hs-se" IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1" diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index f5f4ffe7..9112b78b 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc @@ -9,18 +9,12 @@ KERNEL_DEVICETREE = " \ " # Default tiboot3.bin on AM64x is for SR2.0 HS-FS -BBMULTICONFIG = "k3r5-sr2-hs-fs" -do_image_complete[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP -BBMULTICONFIG += "k3r5-gp" -do_image_complete[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" # Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE -BBMULTICONFIG += "k3r5-sr2-hs-se" -do_image_complete[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" TFA_BOARD = "lite" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 9fe851f4..0ddb088e 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -11,12 +11,7 @@ KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb \ " -# On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw -do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" - # Default sysfw.itb on AM65x is for SR2.0 -BBMULTICONFIG += "k3r5-sr2" -do_image_complete[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" IMAGE_BOOT_FILES += "sysfw.itb" # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 5e325ffe..e33918aa 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -5,9 +5,6 @@ MACHINE_FEATURES += "screen gpu" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" -# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw -do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" - IMAGE_BOOT_FILES += "sysfw.itb" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 31da2ca9..6ca9f17a 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -52,7 +52,7 @@ MACHINE_FEATURES += "efi" WKS_FILE ?= "sdimage-2part-efi.wks" do_image_wic[depends] += "virtual/bootloader:do_deploy" -do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy" +do_image_complete[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc index 377a2b2f..8b8cedbe 100644 --- a/meta-ti-bsp/conf/machine/include/k3r5.inc +++ b/meta-ti-bsp/conf/machine/include/k3r5.inc @@ -15,7 +15,10 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" -SPL_BINARY = "" +SPL_SUFFIX = "bin" +#SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" +SPL_BINARY = "tiboot3.${SPL_SUFFIX}" +SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}" UBOOT_SUFFIX = "bin" UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf index 9544cdb6..070bf7aa 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf @@ -8,10 +8,4 @@ SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" - UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index 56312c0c..74abbbfd 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf @@ -8,10 +8,4 @@ SYSFW_SOC = "j721e_sr1_1" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" - UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index 2a128411..e396bfad 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -19,10 +19,6 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j721s2_evm_a72_defconfig" # Default tiboot3.bin on J721S2 is for GP -BBMULTICONFIG = "k3r5-gp" -do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS -BBMULTICONFIG += "k3r5-sr1-hs-fs" IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf index 337818a4..59f3cfbc 100644 --- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf @@ -14,8 +14,6 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" -do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" - SPL_BINARY = "tispl.bin_HS" UBOOT_BINARY = "u-boot.img_HS" UBOOT_SYMLINK = "u-boot.img" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 7971ad73..8045dd75 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -17,10 +17,6 @@ KERNEL_DEVICETREE = "" UBOOT_MACHINE = "j784s4_evm_a72_defconfig" # Default tiboot3.bin on J784S4 is for GP -BBMULTICONFIG = "k3r5-gp" -do_image_complete[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" # Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS -BBMULTICONFIG += "k3r5-sr1-hs-fs" IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" -do_image_complete[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" diff --git a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf index 123de8c1..12163dd8 100644 --- a/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-hs-evm.conf @@ -14,8 +14,6 @@ KERNEL_DEVICETREE = " \ UBOOT_MACHINE = "j784s4_evm_a72_defconfig" -do_image_complete[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" - TFA_BOARD = "j784s4" SPL_BINARY = "tispl.bin_HS" From patchwork Tue Apr 25 17:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22987 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 796DDC77B73 for ; Tue, 25 Apr 2023 17:23:59 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.85711.1682443432436174607 for ; Tue, 25 Apr 2023 10:23:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=HpKxmtU8; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNoxX004284; Tue, 25 Apr 2023 12:23:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1682443430; bh=EEFG2tBPzPqUYgnba3GovRstc0BW6yEUDO9f0pBlBKc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=HpKxmtU8MPAJBrRzzMMYmTuzHvZdPiArLusFUXWjG97cQ87G3/ZO+yIaZURLe/ZSj TsNbUWV5gilbZoN3bxa+W3+BBbURxyHcrlE9CcbDGdKA9HvbpMngrZEFaxn7PCwngx drKwPfUgBX2B62iQM8wd5gU938tXauVyek3UyppA= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 33PHNon5090995 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Apr 2023 12:23:50 -0500 Received: from DLEE106.ent.ti.com (157.170.170.36) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Tue, 25 Apr 2023 12:23:50 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE106.ent.ti.com (157.170.170.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Tue, 25 Apr 2023 12:23:49 -0500 Received: from ula0226330.dal.design.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 33PHNj0w030178; Tue, 25 Apr 2023 12:23:49 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Praneeth Bajjuri , Neha Malcom Francis , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][RFC 9/9] conf: machine: Remove all leftover config files Date: Tue, 25 Apr 2023 12:23:45 -0500 Message-ID: <20230425172345.12293-10-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230425172345.12293-1-afd@ti.com> References: <20230425172345.12293-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Apr 2023 17:23:59 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16427 Signed-off-by: Andrew Davis --- .../conf/machine/am62axx-evm-k3r5-gp.conf | 19 ---------------- .../conf/machine/am62axx-evm-k3r5-hs-fs.conf | 14 ------------ .../conf/machine/am62axx-evm-k3r5-hs-se.conf | 22 ------------------- .../conf/machine/am62xx-evm-k3r5-gp.conf | 18 --------------- .../conf/machine/am62xx-evm-k3r5-hs-fs.conf | 14 ------------ .../conf/machine/am62xx-evm-k3r5-hs-se.conf | 21 ------------------ .../machine/am62xx-lp-evm-k3r5-hs-fs.conf | 14 ------------ .../machine/am62xx-lp-evm-k3r5-hs-se.conf | 21 ------------------ .../conf/machine/am64xx-evm-k3r5-gp.conf | 20 ----------------- .../machine/am64xx-evm-k3r5-sr2-hs-fs.conf | 14 ------------ .../machine/am64xx-evm-k3r5-sr2-hs-se.conf | 20 ----------------- .../conf/machine/am65xx-evm-k3r5-sr2.conf | 11 ---------- .../conf/machine/am65xx-hs-evm-k3r5-sr2.conf | 11 ---------- .../conf/machine/j721s2-evm-k3r5-gp.conf | 20 ----------------- .../machine/j721s2-evm-k3r5-sr1-hs-fs.conf | 15 ------------- .../conf/machine/j784s4-evm-k3r5-gp.conf | 20 ----------------- .../machine/j784s4-evm-k3r5-sr1-hs-fs.conf | 16 -------------- meta-ti-bsp/conf/multiconfig/k3r5-gp.conf | 3 --- meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf | 3 --- meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf | 3 --- .../conf/multiconfig/k3r5-sr1-hs-fs.conf | 3 --- meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf | 3 --- .../conf/multiconfig/k3r5-sr2-hs-fs.conf | 3 --- .../conf/multiconfig/k3r5-sr2-hs-se.conf | 3 --- meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf | 3 --- 25 files changed, 314 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf delete mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf delete mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf delete mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf delete mode 100644 meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf delete mode 100644 meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf delete mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf delete mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf delete mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-gp.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf deleted file mode 100644 index 962413c3..00000000 --- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf +++ /dev/null @@ -1,19 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62A GP EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am62ax" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -SYSFW_TIBOOT3_SYMLINK = "" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am62ax_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf deleted file mode 100644 index 256f021a..00000000 --- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62A HS-FS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core) - -# Booting HS-FS requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-hs-fs" - -SYSFW_SOC = "am62ax" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - -UBOOT_MACHINE = "am62ax_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf deleted file mode 100644 index c7cb0681..00000000 --- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf +++ /dev/null @@ -1,22 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62A HS-SE EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core) - -# Booting HS-SE requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-hs-se" - -SYSFW_SOC = "am62ax" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -SYSFW_TIBOOT3_SYMLINK = "" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am62ax_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf deleted file mode 100644 index ab18301a..00000000 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf +++ /dev/null @@ -1,18 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62XX EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -SYSFW_TIBOOT3_SYMLINK = "" - -UBOOT_MACHINE = "am62x_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf deleted file mode 100644 index 0dad1104..00000000 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62xx HS-FS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62xx HS-FS EVM (R5F core) - -# Booting HS-FS requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-hs-fs" - -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - -UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf deleted file mode 100644 index 7bca513a..00000000 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf +++ /dev/null @@ -1,21 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62xx HS-SE EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F core) - -# Booting HS-SE requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-hs-se" - -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -SYSFW_TIBOOT3_SYMLINK = "" - -UBOOT_MACHINE = "am62x_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf deleted file mode 100644 index 9026b67c..00000000 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62xx LPSK HS-FS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-FS EVM (R5F core) - -# Booting HS-FS requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-hs-fs" - -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf deleted file mode 100644 index c126de0f..00000000 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf +++ /dev/null @@ -1,21 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62xx LPSK HS-SE EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-SE EVM (R5F core) - -# Booting HS-SE requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-hs-se" - -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" - -SYSFW_TIBOOT3_SYMLINK = "" - -UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf deleted file mode 100644 index 50bf6a07..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx GP EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core) - -# Booting GP requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-gp" - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" -SYSFW_TIBOOT3_SYMLINK = "" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf deleted file mode 100644 index 42ddbb4c..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx SR2.0 HS-FS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core) - -# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-sr2-hs-fs" - -SYSFW_SOC = "am64x_sr2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf deleted file mode 100644 index a1c2b3e6..00000000 --- a/meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx SR2.0 HS-SE EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core) - -# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-sr2-hs-se" - -SYSFW_SOC = "am64x_sr2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_TIBOOT3_SYMLINK = "" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf deleted file mode 100644 index e74dd3ab..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx SR2.0 EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core) - -# Booting SR2 requires different SYSFW, the rest is handled at runtime - -require conf/machine/am65xx-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" - -SYSFW_SOC = "am65x_sr2" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf deleted file mode 100644 index ff1645e4..00000000 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM65xx SR2.0 HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core) - -# Booting SR2 requires different SYSFW, the rest is handled at runtime - -require conf/machine/am65xx-hs-evm-k3r5.conf -SOC_FAMILY:append = ":k3r5-sr2" - -SYSFW_SOC = "am65x_sr2" -SYSFW_SYMLINK = "sysfw.itb" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf deleted file mode 100644 index 95771139..00000000 --- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Machine -#@NAME: J721S2 GP EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core) - -# Booting GP requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-gp" - -SYSFW_SOC = "j721s2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" -SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" - -UBOOT_MACHINE = "j721s2_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf deleted file mode 100644 index 1a77830d..00000000 --- a/meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf +++ /dev/null @@ -1,15 +0,0 @@ -#@TYPE: Machine -#@NAME: J721S2 HS-FS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core) - -# Booting HS-FS requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-sr1-hs-fs" - -SYSFW_SOC = "j721s2" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" -SYSFW_TIBOOT3_SYMLINK = "" - -UBOOT_MACHINE = "j721s2_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf deleted file mode 100644 index 6f7ef92e..00000000 --- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf +++ /dev/null @@ -1,20 +0,0 @@ -#@TYPE: Machine -#@NAME: J784S4 GP EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J784S4 GP EVM (R5F core) - -# Booting GP requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-gp" - -SYSFW_SOC = "j784s4" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" -SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" - -UBOOT_MACHINE = "j784s4_evm_r5_defconfig" - -SPL_BINARY = "" -UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf deleted file mode 100644 index 18b38305..00000000 --- a/meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf +++ /dev/null @@ -1,16 +0,0 @@ -#@TYPE: Machine -#@NAME: J784S4 HS-FS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI J784S4 HS-FS EVM (R5F core) - -# Booting HS-FS requires different SYSFW, the rest is handled at runtime - -require conf/machine/include/k3r5.inc -SOC_FAMILY:append = ":k3r5-sr1-hs-fs" - -SYSFW_SOC = "j784s4" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs-fs" -SYSFW_TIBOOT3_SYMLINK = "" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf b/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf deleted file mode 100644 index 80491e35..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-gp.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5.conf - -MACHINE:append = "-gp" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf deleted file mode 100644 index e22204ee..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5.conf - -MACHINE:append = "-hs-fs" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf deleted file mode 100644 index 7e3d7dae..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5.conf - -MACHINE:append = "-hs-se" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf deleted file mode 100644 index 505f08d5..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5-sr1.conf - -MACHINE:append = "-hs-fs" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf deleted file mode 100644 index 1c8098cd..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5.conf - -MACHINE:append = "-sr1" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf deleted file mode 100644 index 98972326..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5-sr2.conf - -MACHINE:append = "-hs-fs" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf deleted file mode 100644 index 8b98fc0a..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5-sr2.conf - -MACHINE:append = "-hs-se" diff --git a/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf b/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf deleted file mode 100644 index e933b9cc..00000000 --- a/meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf +++ /dev/null @@ -1,3 +0,0 @@ -require k3r5.conf - -MACHINE:append = "-sr2"