Add combined boot flow support for the AM64XX device.
From: Dan Murphy <[email protected]>
Signed-off-by: Dan Murphy <[email protected]>
---
conf/machine/am64xx-evm.conf | 4 ++++
recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 1 -
recipes-bsp/u-boot/u-boot-ti.inc | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
index 9336d4ae4c54..eda310a32b14 100644
--- a/conf/machine/am64xx-evm.conf
+++ b/conf/machine/am64xx-evm.conf
@@ -7,5 +7,9 @@ require conf/machine/include/am64xx.inc
IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
UBOOT_MACHINE = "am64x_evm_a53_defconfig"
+
+do_image_wic[depends] += "trusted-firmware-a:do_deploy"
+do_image_tar[depends] += "trusted-firmware-a:do_deploy"
+
do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 7e4809cecc50..4d4a9a349c70 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -4,7 +4,6 @@ DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader"
DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader"
-
CLEANBROKEN = "1"
PR = "r1"
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index 7ce3d7019431..dc8d6b060529 100644
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -41,7 +41,6 @@ PACKAGECONFIG[dm] =
"DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i
PACKAGECONFIG_append_aarch64 = " atf optee"
PACKAGECONFIG_append_j7 = " dm"
-PACKAGECONFIG_append_am64xx = " dm"
COMPATIBLE_MACHINE = "(ti-soc)"
@@ -401,4 +400,5 @@ do_deploy_append_am64xx-evm-k3r5 () {
mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
}
+
TOOLCHAIN = "gcc"
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13410):
https://lists.yoctoproject.org/g/meta-ti/message/13410
Mute This Topic: https://lists.yoctoproject.org/mt/79506712/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
