On 12/20/23 10:07 AM, Andrew Davis wrote:
The R5 SPL bootloader is the only software we build using the R5 (arm32)
multiconfig environment. Using multiconfig pulls in a large number of
build dependencies (see the -native environment in baremetal tmp dir)
this increases build time and space.

Using multiconfig for a deploy target also leads to several oddities in
the bitbake build system forcing use of a non-standard deploy directory
and careful checks that no recipe built in both configuration deploy
the same files.

While I believe we will get more use out of multiconfig for future
devices, today let's simplify the K3 build infrastructure here by
building R5 SPL like a normal firmware using a foreign targeting cross
compiler. This is the technique meta-arm uses to build firmware (see
scp-firmware and trusted-firmware-m recipes). Add a new tiboot3 firmware
recipe here.

With that we can also drop all the related k3r5 multiconfig files and
definitions. Do that here.

Signed-off-by: Andrew Davis <[email protected]>
---
  meta-ti-bsp/classes/ti-secdev.bbclass         |  3 -
  .../conf/machine/am62axx-evm-k3r5.conf        | 11 ----
  meta-ti-bsp/conf/machine/am62axx-evm.conf     |  5 ++
  .../conf/machine/am62pxx-evm-k3r5.conf        | 12 ----
  meta-ti-bsp/conf/machine/am62pxx-evm.conf     |  5 ++
  meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 12 ----
  meta-ti-bsp/conf/machine/am62xx-evm.conf      |  5 ++
  .../conf/machine/am62xx-lp-evm-k3r5.conf      | 11 ----
  meta-ti-bsp/conf/machine/am62xx-lp-evm.conf   |  5 ++
  .../conf/machine/am62xxsip-evm-k3r5.conf      | 16 -----
  meta-ti-bsp/conf/machine/am62xxsip-evm.conf   | 10 +++
  meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf | 11 ----
  meta-ti-bsp/conf/machine/am64xx-evm.conf      |  5 ++
  meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 11 ----
  meta-ti-bsp/conf/machine/am65xx-evm.conf      |  5 ++
  .../conf/machine/am65xx-hs-evm-k3r5.conf      | 11 ----
  meta-ti-bsp/conf/machine/am65xx-hs-evm.conf   |  5 ++
  .../conf/machine/beaglebone-ai64-k3r5.conf    | 17 -----
  meta-ti-bsp/conf/machine/beaglebone-ai64.conf |  5 ++
  meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 14 ----
  meta-ti-bsp/conf/machine/beagleplay.conf      |  5 ++
  meta-ti-bsp/conf/machine/include/k3.inc       |  4 +-
  meta-ti-bsp/conf/machine/include/k3r5.inc     | 27 --------
  meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf  | 11 ----
  meta-ti-bsp/conf/machine/j7200-evm.conf       |  5 ++
  .../conf/machine/j7200-hs-evm-k3r5.conf       | 11 ----
  meta-ti-bsp/conf/machine/j7200-hs-evm.conf    |  5 ++
  meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf  | 11 ----
  meta-ti-bsp/conf/machine/j721e-evm.conf       |  5 ++
  .../conf/machine/j721e-hs-evm-k3r5.conf       | 11 ----
  meta-ti-bsp/conf/machine/j721e-hs-evm.conf    |  3 +-
  meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf | 11 ----
  meta-ti-bsp/conf/machine/j721s2-evm.conf      |  5 ++
  .../conf/machine/j721s2-hs-evm-k3r5.conf      | 11 ----
  meta-ti-bsp/conf/machine/j721s2-hs-evm.conf   |  2 +
  meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf | 11 ----
  meta-ti-bsp/conf/machine/j784s4-evm.conf      |  5 ++
  .../conf/machine/j784s4-hs-evm-k3r5.conf      | 11 ----
  meta-ti-bsp/conf/machine/j784s4-hs-evm.conf   |  2 +
  meta-ti-bsp/conf/multiconfig/k3r5.conf        | 10 ---
  .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb    |  3 -
  .../u-boot/tiboot3-staging_2023.5.bb          | 65 +++++++++++++++++++
  .../recipes-bsp/u-boot/u-boot-bb.org_git.bb   |  2 -
  meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  | 40 ------------
  44 files changed, 152 insertions(+), 303 deletions(-)
  delete mode 100644 meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/include/k3r5.inc
  delete mode 100644 meta-ti-bsp/conf/machine/j7200-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/j721s2-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/j784s4-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/machine/j784s4-hs-evm-k3r5.conf
  delete mode 100644 meta-ti-bsp/conf/multiconfig/k3r5.conf
  create mode 100644 meta-ti-bsp/recipes-bsp/u-boot/tiboot3-staging_2023.5.bb

Hopefully the diffstat above speak for itself in how much
this cleans up :) This also should let us now recombine the
deploy directories and several other cleanups in tisdk-bundle
that have continue to cause user confusion.

This is still and RFC as it needs more testing and a few more
cleanups yet but wanted to get the idea out in the open for
alignment before the final rounds of polishing.

Andrew
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17352): 
https://lists.yoctoproject.org/g/meta-ti/message/17352
Mute This Topic: https://lists.yoctoproject.org/mt/103283292/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to