Skip to contentSkip to conversation

Switch to U-Boot binman

RFC In review Andrew Davis 2 participants 15 messages Apr 25, 2023 – May 6, 2023

lore
Share & tools
lore
#0 lore raw

cover Switch to U-Boot binman

Hello all,

This series is what the binman conversion will look like. As you can see from the diff status below, we are greatly simplifying our boot image building process (removes ~559 lines and ~25 files).

The first 3 patches should be good to go in today. I'd argue the same for the next 2 but I'll take comments on that. Last 4 all need to go in at the same time and be squashed together. They are only broken out into patches to make the review a little bit easier (still a lot of churn I know). They must also wait until the binman work is merged into our TI U-Boot.

Thanks,
Andrew

Andrew Davis (9):
ti-dm-fw: Add recipe for TI DM firmware
ti-eth-fw: Add recipe for TI Ethernet firmware
ti-sci-fw: Remove source package recipe u-boot-bb.org: Remove this recipe
u-boot-ti-staging: Remove version 2021.01
ti-sci-fw: Drop k3-image-gen and only provide firmware
u-boot-ti-staging: Use binman to package our firmware
conf: machine: Switch all the machines over to U-Boot binman
conf: machine: Remove all leftover config files

 .../conf/machine/am62axx-evm-k3r5-gp.conf     |  19 ---
 .../conf/machine/am62axx-evm-k3r5-hs-se.conf  |  22 ---
 ...-k3r5-hs-fs.conf => am62axx-evm-k3r5.conf} |   4 +-
 .../conf/machine/am62xx-evm-k3r5-hs-fs.conf   |  14 --
 .../conf/machine/am62xx-evm-k3r5-hs-se.conf   |  21 ---
 ...-evm-k3r5-gp.conf => am62xx-evm-k3r5.conf} |   7 -
 meta-ti-bsp/conf/machine/am62xx-evm.conf      |   4 +-
 .../machine/am62xx-lp-evm-k3r5-hs-fs.conf     |  14 --
 .../machine/am62xx-lp-evm-k3r5-hs-se.conf     |  21 ---
 .../conf/machine/am62xx-lp-evm-k3r5.conf      |   7 -
 .../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 ---
 meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf |  12 ++
 .../conf/machine/am65xx-evm-k3r5-sr2.conf     |  11 --
 meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf |   7 -
 .../conf/machine/am65xx-hs-evm-k3r5-sr2.conf  |  11 --
 .../conf/machine/am65xx-hs-evm-k3r5.conf      |   7 -
 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 -
 meta-ti-bsp/conf/machine/include/am62axx.inc  |   6 -
 .../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 -
 .../conf/machine/j721e-hs-evm-k3r5.conf       |   6 -
 .../conf/machine/j721s2-evm-k3r5-gp.conf      |  20 ---
 .../machine/j721s2-evm-k3r5-sr1-hs-fs.conf    |  15 --
 meta-ti-bsp/conf/machine/j721s2-evm.conf      |   4 -
 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf   |   2 -
 .../conf/machine/j784s4-evm-k3r5-gp.conf      |  20 ---
 .../machine/j784s4-evm-k3r5-sr1-hs-fs.conf    |  16 --
 meta-ti-bsp/conf/machine/j784s4-evm.conf      |   4 -
 meta-ti-bsp/conf/machine/j784s4-hs-evm.conf   |   2 -
 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 -
 meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb  | 119 +++++++++++++++
 .../recipes-bsp/ti-eth-fw/ti-eth-fw.bb        | 118 ++++++++++++++
 .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc   |  15 +-
 .../ti-sci-fw/ti-sci-fw-source_git.bb         |  45 ------
 .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb    | 144 ++----------------
 .../recipes-bsp/u-boot/u-boot-bb.org_git.bb   |  24 ---
 ...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 -
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  |  14 +-
 .../ti-rtos-bin/ti-rtos-firmware.bb           |  86 +----------
 61 files changed, 286 insertions(+), 845 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-se.conf
 rename meta-ti-bsp/conf/machine/{am62axx-evm-k3r5-hs-fs.conf => am62axx-evm-k3r5.conf} (60%)
 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
 rename meta-ti-bsp/conf/machine/{am62xx-evm-k3r5-gp.conf => am62xx-evm-k3r5.conf} (54%)
 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
 create mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5.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
 create mode 100644 meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
 create mode 100644 meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
 delete mode 100644 meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb
 delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
 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
Signature · 1 line
2.39.2
#1 lore raw

RFC 1/9 ti-dm-fw: Add recipe for TI DM firmware

Split out the TI DM firmware from ti-rtos-firmware.

---
 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
meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb new file +119 -0
new file mode 100644
index 00000000..8fb40d12
@@ -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
meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +1 -0
index 1a5ea534..912ca63f 100644
@@ -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}"
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +1 -1
index 8e236dfe..38ce5a58 100644
@@ -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"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +0 -48

122 lines not on this page · raw message

Signature · 1 line
2.39.2
#2 lore raw

RFC 2/9 ti-eth-fw: Add recipe for TI Ethernet firmware

In reply to Andrew Davis

Split out the TI Ethernet firmware from ti-rtos-firmware.

---
 .../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
meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb new file +118 -0
new file mode 100644
index 00000000..1a8d4aef
@@ -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"
meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +5 -33
index 55f55ed5..7958c0e6 100644
@@ -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}"
Signature · 1 line
2.39.2
#3 lore raw

RFC 3/9 ti-sci-fw: Remove source package recipe

In reply to Andrew Davis

K3-image-gen is going away and we don't do SRCIPK packages like this anymore anyway. Remove this recipe.

---
 .../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
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw-source_git.bb deleted +0 -45
deleted file mode 100644
index bab4acf0..00000000
@@ -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}"
Signature · 1 line
2.39.2
#4 lore raw

RFC 4/9 u-boot-bb.org: Remove this recipe

In reply to Andrew Davis

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.

---
 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
meta-ti-bsp/conf/machine/beagle-x15.conf +0 -2
index fb52245b..be27705c 100644
@@ -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"
 
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +0 -3
index 7c99b5d4..b893f380 100644
@@ -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"
meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0 -2
index 304cbb62..bd5f541f 100644
@@ -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 \
meta-ti-bsp/conf/machine/beaglebone.conf +0 -2
index dceef1db..2d811d0d 100644
@@ -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"
 
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +0 -3
index c40615c9..f8f08d63 100644
@@ -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"
meta-ti-bsp/conf/machine/beagleplay.conf +0 -2
index e8d25cd9..f4f6a49c 100644
@@ -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 \
meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb deleted +0 -24
deleted file mode 100644
index 4e4688aa..00000000
@@ -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"
Signature · 1 line
2.39.2
#10 lore raw

RFC 5/9 u-boot-ti-staging: Remove version 2021.01

In reply to Andrew Davis

This will no longer build after we switch away from k3-image-gen. Remove this version and make 2023.04 the default.

---
 ...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
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging-2021.01/0001-configs-Update-to-support-oe-core-fitImage-naming.patch deleted +0 -144
deleted file mode 100644
index 9a832312..00000000
@@ -1,144 +0,0 @@
-From 33c4b7335a39c48507a254505169df59c7a69c75 Mon Sep 17 00:00:00 2001
-From: Ryan Eatmon <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb deleted +0 -15
deleted file mode 100644
index 7529ce6c..00000000
@@ -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"
-
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb +0 -2
index 6a46e812..c7006717 100644
@@ -7,5 +7,3 @@ PR = "r0"
 BRANCH = "ti-u-boot-2023.04"
 
 SRCREV = "41a88ad529b3943b1e465846eb24fe2c29203e35"
-
-DEFAULT_PREFERENCE = "-1"
Signature · 1 line
2.39.2
#11 lore raw

RFC 6/9 ti-sci-fw: Drop k3-image-gen and only provide firmware

In reply to Andrew Davis

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.

---
 .../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(-)
meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +3 -11
index 912ca63f..f42b5210 100644
@@ -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"
meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +9 -135

158 lines not on this page · raw message

Signature · 1 line
2.39.2
#12 lore raw

RFC 7/9 u-boot-ti-staging: Use binman to package our firmware

In reply to Andrew Davis
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +10 -2
index 38ce5a58..c7fab71f 100644
@@ -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"
Signature · 1 line
2.39.2
#13 lore raw

RFC 8/9 conf: machine: Switch all the machines over to U-Boot binman

In reply to 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
meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf new file +12 -0
new file mode 100644
index 00000000..80b6497f
@@ -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"
meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf new file +11 -0
new file mode 100644
index 00000000..724a8d4a
@@ -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"
meta-ti-bsp/conf/machine/am62xx-evm.conf +2 -2
index d54213d4..5b86a1f5 100644
@@ -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"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +0 -7
index 15ecc677..54059dd7 100644
@@ -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}"
meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf new file +12 -0
new file mode 100644
index 00000000..4369becc
@@ -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"
meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +0 -7
index a484e444..b1b2490e 100644
@@ -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"
meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +0 -7
index d9041c9d..836460e9 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am62axx.inc +0 -6
index eacfa584..5cc95585 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am62xx-lp.inc +0 -4
index bcc6f493..3c0249eb 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -6
index 623d90eb..cb8db03f 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am64xx.inc +0 -6
index f5f4ffe7..9112b78b 100644
@@ -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"
meta-ti-bsp/conf/machine/include/am65xx.inc +0 -5
index 9fe851f4..0ddb088e 100644
@@ -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
meta-ti-bsp/conf/machine/include/j721e.inc +0 -3
index 5e325ffe..e33918aa 100644
@@ -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"
meta-ti-bsp/conf/machine/include/k3.inc +1 -1
index 31da2ca9..6ca9f17a 100644
@@ -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}"
meta-ti-bsp/conf/machine/include/k3r5.inc +4 -1
index 377a2b2f..8b8cedbe 100644
@@ -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}"
meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf +0 -6
index 9544cdb6..070bf7aa 100644
@@ -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"
meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +0 -6
index 56312c0c..74abbbfd 100644
@@ -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"
meta-ti-bsp/conf/machine/j721s2-evm.conf +0 -4
index 2a128411..e396bfad 100644
@@ -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"
meta-ti-bsp/conf/machine/j721s2-hs-evm.conf +0 -2
index 337818a4..59f3cfbc 100644
@@ -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"
meta-ti-bsp/conf/machine/j784s4-evm.conf +0 -4
index 7971ad73..8045dd75 100644
@@ -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"
meta-ti-bsp/conf/machine/j784s4-hs-evm.conf +0 -2
index 123de8c1..12163dd8 100644
@@ -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"
Signature · 1 line
2.39.2
#14 lore raw

RFC 9/9 conf: machine: Remove all leftover config files

In reply to 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
meta-ti-bsp/conf/machine/am62axx-evm-k3r5-gp.conf deleted +0 -19
deleted file mode 100644
index 962413c3..00000000
@@ -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}"
meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-fs.conf deleted +0 -14
deleted file mode 100644
index 256f021a..00000000
@@ -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"
meta-ti-bsp/conf/machine/am62axx-evm-k3r5-hs-se.conf deleted +0 -22
deleted file mode 100644
index c7cb0681..00000000
@@ -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}"
meta-ti-bsp/conf/machine/am62xx-evm-k3r5-gp.conf deleted +0 -18
deleted file mode 100644
index ab18301a..00000000
@@ -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}"
meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-fs.conf deleted +0 -14
deleted file mode 100644
index 0dad1104..00000000
@@ -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"
meta-ti-bsp/conf/machine/am62xx-evm-k3r5-hs-se.conf deleted +0 -21
deleted file mode 100644
index 7bca513a..00000000
@@ -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}"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf deleted +0 -14
deleted file mode 100644
index 9026b67c..00000000
@@ -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"
meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf deleted +0 -21
deleted file mode 100644
index c126de0f..00000000
@@ -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}"
meta-ti-bsp/conf/machine/am64xx-evm-k3r5-gp.conf deleted +0 -20
deleted file mode 100644
index 50bf6a07..00000000
@@ -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}"
meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf deleted +0 -14
deleted file mode 100644
index 42ddbb4c..00000000
@@ -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"
meta-ti-bsp/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf deleted +0 -20
deleted file mode 100644
index a1c2b3e6..00000000
@@ -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}"
meta-ti-bsp/conf/machine/am65xx-evm-k3r5-sr2.conf deleted +0 -11
deleted file mode 100644
index e74dd3ab..00000000
@@ -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"
meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5-sr2.conf deleted +0 -11
deleted file mode 100644
index ff1645e4..00000000
@@ -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"
meta-ti-bsp/conf/machine/j721s2-evm-k3r5-gp.conf deleted +0 -20
deleted file mode 100644
index 95771139..00000000
@@ -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}"
meta-ti-bsp/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf deleted +0 -15
deleted file mode 100644
index 1a77830d..00000000
@@ -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"
meta-ti-bsp/conf/machine/j784s4-evm-k3r5-gp.conf deleted +0 -20
deleted file mode 100644
index 6f7ef92e..00000000
@@ -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}"
meta-ti-bsp/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf deleted +0 -16
deleted file mode 100644
index 18b38305..00000000
@@ -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"
meta-ti-bsp/conf/multiconfig/k3r5-gp.conf deleted +0 -3
deleted file mode 100644
index 80491e35..00000000
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE:append = "-gp"
meta-ti-bsp/conf/multiconfig/k3r5-hs-fs.conf deleted +0 -3
deleted file mode 100644
index e22204ee..00000000
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE:append = "-hs-fs"
meta-ti-bsp/conf/multiconfig/k3r5-hs-se.conf deleted +0 -3
deleted file mode 100644
index 7e3d7dae..00000000
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE:append = "-hs-se"
meta-ti-bsp/conf/multiconfig/k3r5-sr1-hs-fs.conf deleted +0 -3
deleted file mode 100644
index 505f08d5..00000000
@@ -1,3 +0,0 @@
-require k3r5-sr1.conf
-
-MACHINE:append = "-hs-fs"
meta-ti-bsp/conf/multiconfig/k3r5-sr1.conf deleted +0 -3
deleted file mode 100644
index 1c8098cd..00000000
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE:append = "-sr1"
meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-fs.conf deleted +0 -3
deleted file mode 100644
index 98972326..00000000
@@ -1,3 +0,0 @@
-require k3r5-sr2.conf
-
-MACHINE:append = "-hs-fs"
meta-ti-bsp/conf/multiconfig/k3r5-sr2-hs-se.conf deleted +0 -3
deleted file mode 100644
index 8b98fc0a..00000000
@@ -1,3 +0,0 @@
-require k3r5-sr2.conf
-
-MACHINE:append = "-hs-se"
meta-ti-bsp/conf/multiconfig/k3r5-sr2.conf deleted +0 -3
deleted file mode 100644
index e933b9cc..00000000
@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE:append = "-sr2"
Signature · 1 line
2.39.2
#5 lore raw

Re: [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe

In reply to Andrew Davis
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org

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.

This comment is not very clear - aren't you also removing that here?

Would it be possible to preserve at least Beagle build flows intact? Can the existing ti-sci-fw recipe that uses k3-image-gen be kept for now alongside the new one, e.g. move it to ti-sci-fw-legacy or something?

Quoted 124 lines
---
 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
meta-ti-bsp/conf/machine/beagle-x15.conf +0 -2
index fb52245b..be27705c 100644
@@ -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"
 
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +0 -3
index 7c99b5d4..b893f380 100644
@@ -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"
meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0 -2
index 304cbb62..bd5f541f 100644
@@ -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 \
meta-ti-bsp/conf/machine/beaglebone.conf +0 -2
index dceef1db..2d811d0d 100644
@@ -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"
 
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +0 -3
index c40615c9..f8f08d63 100644
@@ -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"
meta-ti-bsp/conf/machine/beagleplay.conf +0 -2
index e8d25cd9..f4f6a49c 100644
@@ -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 \
meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb deleted +0 -24
deleted file mode 100644
index 4e4688aa..00000000
@@ -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"
Signature · 1 line
2.39.2
#6 lore raw

Re: [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe

Quoted 9 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org

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.

This comment is not very clear - aren't you also removing that here?

Not here, I do that in the *next* patch :)

I usually sort my patches from least to most controversial, so the first 3-4 can be taken stopping here without breaking as much.

Quoted 4 lines

Would it be possible to preserve at least Beagle build flows intact? Can the existing ti-sci-fw recipe that uses k3-image-gen be kept for now alongside the new one, e.g. move it to ti-sci-fw-legacy or something?

I have found no such way :(

All the multiconf and deploy logic expects k3-image-gen and now needs moved over to the new way. Supporting both would mean forking almost everything removed by this series.

The benefit is not there IMHO since the beagle platforms should boot almost exactly the same on our TI tree as the bb.org version.

Moving forward, bb.org will also have to make this migration as k3-image-gen will soon be deprecated. When they do, if we still want their fork in meta-ti we can bring it back in.

Andrew

Quoted 125 lines
Quoted 125 lines
---
  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

meta-ti-bsp/conf/machine/beagle-x15.conf +0 -2
index fb52245b..be27705c 100644
@@ -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"
 
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +0 -3
index 7c99b5d4..b893f380 100644
@@ -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"
meta-ti-bsp/conf/machine/beaglebone-ai64.conf +0 -2
index 304cbb62..bd5f541f 100644
@@ -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 \
meta-ti-bsp/conf/machine/beaglebone.conf +0 -2
index dceef1db..2d811d0d 100644
@@ -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"
 
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +0 -3
index c40615c9..f8f08d63 100644
@@ -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"
meta-ti-bsp/conf/machine/beagleplay.conf +0 -2
index e8d25cd9..f4f6a49c 100644
@@ -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 \
meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb deleted +0 -24
deleted file mode 100644
index 4e4688aa..00000000
@@ -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"
Signature · 1 line
2.39.2
#7 lore raw

Re: [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe

Quoted 19 lines · Andrew Davis
Quoted 8 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org

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.

This comment is not very clear - aren't you also removing that here?

Not here, I do that in the *next* patch :)

I usually sort my patches from least to most controversial, so the first 3-4 can be taken stopping here without breaking as much.

Quoted 3 lines

Would it be possible to preserve at least Beagle build flows intact? Can the existing ti-sci-fw recipe that uses k3-image-gen be kept for now alongside the new one, e.g. move it to ti-sci-fw-legacy or something?

Quoted 5 lines

I have found no such way :(

All the multiconf and deploy logic expects k3-image-gen and now needs moved over to the new way. Supporting both would mean forking almost everything removed by this series.

But on the other hand, BBAI64 and BeaglePlay only support GP and don't set any additional multiconfigs besides the main k3r5. I feel like creating a separate ti-sci-fw-bb.org with k3-image-gen might be possible. But I haven't tried that myself yet...

Quoted 6 lines

The benefit is not there IMHO since the beagle platforms should boot almost exactly the same on our TI tree as the bb.org version.

Moving forward, bb.org will also have to make this migration as k3-image-gen will soon be deprecated. When they do, if we still want their fork in meta-ti we can bring it back in.

The issue is that it will take time for bb.org to switch over to the latest TI 6.1 kernel and 2023 U-boot with binman. Moreover, they only support Debian, so don't expect timely OE recipe updates. And in all this potentially long time there won't be any OE support for BB platforms. But there are active OE BB users here and I'm trying to find a way to not throw them under the bus...

Signature · 1 line
Denys
#8 lore raw

Re: [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe

Quoted 39 lines · Denys Dmytriyenko
Quoted 19 lines · Andrew Davis
Quoted 8 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org

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.

This comment is not very clear - aren't you also removing that here?

Not here, I do that in the *next* patch :)

I usually sort my patches from least to most controversial, so the first 3-4 can be taken stopping here without breaking as much.

Quoted 3 lines

Would it be possible to preserve at least Beagle build flows intact? Can the existing ti-sci-fw recipe that uses k3-image-gen be kept for now alongside the new one, e.g. move it to ti-sci-fw-legacy or something?

Quoted 5 lines

I have found no such way :(

All the multiconf and deploy logic expects k3-image-gen and now needs moved over to the new way. Supporting both would mean forking almost everything removed by this series.

But on the other hand, BBAI64 and BeaglePlay only support GP and don't set any additional multiconfigs besides the main k3r5. I feel like creating a separate ti-sci-fw-bb.org with k3-image-gen might be possible. But I haven't tried that myself yet...

Quoted 6 lines

The benefit is not there IMHO since the beagle platforms should boot almost exactly the same on our TI tree as the bb.org version.

Moving forward, bb.org will also have to make this migration as k3-image-gen will soon be deprecated. When they do, if we still want their fork in meta-ti we can bring it back in.

Quoted 6 lines

The issue is that it will take time for bb.org to switch over to the latest TI 6.1 kernel and 2023 U-boot with binman. Moreover, they only support Debian, so don't expect timely OE recipe updates. And in all this potentially long time there won't be any OE support for BB platforms. But there are active OE BB users here and I'm trying to find a way to not throw them under the bus...

This will only force them to use 2023 U-boot, which seems to boot the BB boards just fine already. The kernel can remain 5.10 until bb.org upgrades.

Andrew

#9 lore raw

Re: [meta-ti][master/kirkstone][RFC 4/9] u-boot-bb.org: Remove this recipe

Quoted 47 lines · Andrew Davis
Quoted 39 lines · Denys Dmytriyenko
Quoted 19 lines · Andrew Davis
Quoted 8 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org

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.

This comment is not very clear - aren't you also removing that here?

Not here, I do that in the *next* patch :)

I usually sort my patches from least to most controversial, so the first 3-4 can be taken stopping here without breaking as much.

Quoted 3 lines

Would it be possible to preserve at least Beagle build flows intact? Can the existing ti-sci-fw recipe that uses k3-image-gen be kept for now alongside the new one, e.g. move it to ti-sci-fw-legacy or something?

Quoted 5 lines

I have found no such way :(

All the multiconf and deploy logic expects k3-image-gen and now needs moved over to the new way. Supporting both would mean forking almost everything removed by this series.

But on the other hand, BBAI64 and BeaglePlay only support GP and don't set any additional multiconfigs besides the main k3r5. I feel like creating a separate ti-sci-fw-bb.org with k3-image-gen might be possible. But I haven't tried that myself yet...

Quoted 6 lines

The benefit is not there IMHO since the beagle platforms should boot almost exactly the same on our TI tree as the bb.org version.

Moving forward, bb.org will also have to make this migration as k3-image-gen will soon be deprecated. When they do, if we still want their fork in meta-ti we can bring it back in.

Quoted 6 lines

The issue is that it will take time for bb.org to switch over to the latest TI 6.1 kernel and 2023 U-boot with binman. Moreover, they only support Debian, so don't expect timely OE recipe updates. And in all this potentially long time there won't be any OE support for BB platforms. But there are active OE BB users here and I'm trying to find a way to not throw them under the bus...

Quoted 2 lines

This will only force them to use 2023 U-boot, which seems to boot the BB boards just fine already. The kernel can remain 5.10 until bb.org upgrades.

Interesting. I would have to try this combination some time soon...