1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-02-28 16:40:15 +00:00

Compare commits

..

6 Commits

Author SHA1 Message Date
Denys Dmytriyenko (TI)
df144cc0cc beagle-bsp: unset TI_CORE_INITRAMFS_KERNEL_MODULES
As BB.org kernel comes with own custom defconfig, there are no modules
required to be loaded from initramfs in order to boot the platforms, as
required drivers are built in. Unset the list of such modules to avoid
breakage.

Signed-off-by: Denys Dmytriyenko (TI) <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2026-02-27 17:38:47 -06:00
Randolph Sapp
8ecd80cb13 beagleplay-ti: use the am62xx.inc
We should inherit the am62xx.inc and just override values as needed.

Signed-off-by: Randolph Sapp <rs@ti.com>
Acked-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2026-02-27 16:13:41 -06:00
Randolph Sapp
cde011e85c beagley-ai: add beagley-ai-ti
Split the existing config into a beagley-ai-ti and beagley-ai that
includes it, like the existing beagleplay machine.

Signed-off-by: Randolph Sapp <rs@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2026-02-27 16:13:41 -06:00
Randolph Sapp
8e17ab43a3 meta-beagle: move all beagle board configurations
Move all beagle board configurations to meta-beagle. There are 2 skews
currently:

1. A base TI configuration setting all the default variables required to
   use the device with meta-ti-bsp provided packages.

2. An override that uses meta-beagle BSP components. This includes all
   the values defined in the TI skew as well as any meta-beagle specific
   configuration.

Signed-off-by: Randolph Sapp <rs@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2026-02-27 16:13:41 -06:00
Ryan Eatmon
078bd11cee conf: Add falcon support natively
Add support for building falcon natively and remove the ti-falcon build
option.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2026-02-27 16:13:41 -06:00
Ryan Eatmon
8d3489bd0b u-boot: Move the TFA memory location for all k3 platforms
In preparation for supporting falcon boot, we are globally moving all k3
memory locations for TFA.  Trying to do this platform by platform and
only for falcon builds was proving to be onerous, so it was decide to
just move it for all Yocto builds.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
2026-02-27 16:13:41 -06:00
24 changed files with 204 additions and 65 deletions

View File

@@ -2,23 +2,10 @@
#@NAME: BeaglePlay (A53)
#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
require conf/machine/include/k3.inc
require conf/machine/include/mc_k3r5.inc
SOC_FAMILY:append = ":am62xx"
MACHINE_FEATURES += "screen"
require conf/machine/include/am62xx.inc
SERIAL_CONSOLES = "115200;ttyS2"
require conf/machine/include/mesa-pvr.inc
PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
TFA_BOARD = "lite"
TFA_K3_SYSTEM_SUSPEND = "1"
OPTEEMACHINE = "k3-am62x"
UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
SPL_BINARY = "tispl.bin_unsigned"

View File

@@ -2,10 +2,8 @@
#@NAME: BeagleY AI (R5F)
#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
require conf/machine/include/k3r5.inc
require conf/machine/beagley-ai-ti-k3r5.conf
require conf/machine/include/beagle-bsp.inc
UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_r5_defconfig"

View File

@@ -0,0 +1,8 @@
#@TYPE: Machine
#@NAME: BeagleY AI (R5F)
#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am67a_beagley_ai_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_r5_defconfig"

View File

@@ -0,0 +1,15 @@
#@TYPE: Machine
#@NAME: BeagleY AI (A53)
#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
require conf/machine/include/j722s.inc
UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_a53_config"
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am67a \
ti/k3-j722s \
"
MACHINE_GUI_CLASS = "bigscreen"

View File

@@ -2,18 +2,11 @@
#@NAME: BeagleY AI (A53)
#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
require conf/machine/include/j722s.inc
require conf/machine/beagley-ai-ti.conf
require conf/machine/include/beagle-bsp.inc
UBOOT_MACHINE = "am67a_beagley_ai_a53_defconfig"
UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config"
UBOOT_MACHINE:bsp-ti-6_6 = "j722s_evm_a53_config"
UBOOT_MACHINE:bsp-ti-6_12 = "j722s_evm_a53_config"
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am67a \
ti/k3-j722s \
"
KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \
ti/k3-am67a-beagley-ai.dtb \

View File

@@ -15,6 +15,7 @@ BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%"
BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org"
BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%"
KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-bb_org-6_12 = ""
BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
@@ -36,6 +37,7 @@ BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-bb_org-6_6 = ""
BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"

View File

@@ -4,14 +4,14 @@
require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
UBOOT_MACHINE:tie-test-builds = ""
UBOOT_MACHINE = ""
UBOOT_CONFIG = ""
UBOOT_CONFIG:tie-test-builds = "usbdfu main"
#XXX UBOOT_CONFIG = "falcon main"
UBOOT_CONFIG = "main"
UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
UBOOT_CONFIG[main] = "am62ax_evm_r5_defconfig"
UBOOT_CONFIG[falcon] = "am62ax_evm_r5_defconfig"
UBOOT_CONFIG[usbdfu] = "am62ax_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

View File

@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM
require conf/machine/include/am62axx.inc
#XXX require conf/machine/include/ti-falcon.inc
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am62a7 \

View File

@@ -11,15 +11,18 @@ UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = ""
UBOOT_ECDSA_SIGN_CONFIG:bsp-next = ""
UBOOT_ECDSA_SIGN_CONFIG:bsp-mainline = ""
#UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} falcon main"
UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} main"
UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
UBOOT_CONFIG[main] = "am62px_evm_r5_defconfig"
UBOOT_CONFIG[falcon] = "am62ax_evm_r5_defconfig"
UBOOT_CONFIG[ecdsa] = "am62px_evm_r5_defconfig"
UBOOT_CONFIG[usbdfu] = "am62px_evm_r5_defconfig"
UBOOT_CONFIG_MAKE_OPTS[ecdsa] = "${TI_SIGN_WITH_ECDSA_KEY}"
UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

View File

@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI AM62PX EVM
require conf/machine/include/am62pxx.inc
#XXX require conf/machine/include/ti-falcon.inc
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am62p5 \

View File

@@ -4,14 +4,13 @@
require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am62x_evm_r5_defconfig"
UBOOT_MACHINE:tie-test-builds = ""
UBOOT_MACHINE = ""
UBOOT_CONFIG = ""
UBOOT_CONFIG:tie-test-builds = "usbdfu main"
UBOOT_CONFIG = "falcon main"
UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
UBOOT_CONFIG[main] = "am62x_evm_r5_defconfig"
UBOOT_CONFIG[falcon] = "am62x_evm_r5_defconfig"
UBOOT_CONFIG[usbdfu] = "am62x_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

View File

@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI AM62XX EVM
require conf/machine/include/am62xx.inc
require conf/machine/include/ti-falcon.inc
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am625 \

View File

@@ -4,14 +4,14 @@
require conf/machine/include/k3r5.inc
UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
UBOOT_MACHINE:tie-test-builds = ""
UBOOT_MACHINE = ""
UBOOT_CONFIG = ""
UBOOT_CONFIG:tie-test-builds = "usbdfu main"
#XXX UBOOT_CONFIG = "falcon main"
UBOOT_CONFIG = "main"
UBOOT_CONFIG:prepend:tie-test-builds = "usbdfu "
UBOOT_CONFIG[main] = "am62x_lpsk_r5_defconfig"
UBOOT_CONFIG[falcon] = "am62x_lpsk_r5_defconfig"
UBOOT_CONFIG[usbdfu] = "am62x_lpsk_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS[falcon] = "k3_r5_falcon.config"
UBOOT_CONFIG_FRAGMENTS[usbdfu] = "am62x_r5_usbdfu.config"
UBOOT_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

View File

@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
require conf/machine/include/am62xx.inc
#XXX require conf/machine/include/ti-falcon.inc
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-am62-lp \

View File

@@ -33,6 +33,17 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image ti-kernel-fitimage"
TFA_PLATFORM = "k3"
# Change the default memory location for all k3 devices. This requires an
# in layer config fragment for u-boot.
TI_TFA_K3_PRELOADED_BL33 = "0x82000000"
TI_TFA_K3_PRELOADED_BL33:bsp-ti-6_6 = ""
TI_TFA_K3_HW_CONFIG_BASE = "0x88000000"
TI_TFA_K3_HW_CONFIG_BASE:bsp-ti-6_6 = ""
TFA_K3_PRELOADED_BL33 ?= "${TI_TFA_K3_PRELOADED_BL33}"
TFA_K3_HW_CONFIG_BASE ?= "${TI_TFA_K3_HW_CONFIG_BASE}"
# Use the expected value of the ubifs filesystem's volume name in the kernel
# and u-boot.
UBI_VOLNAME = "rootfs"
@@ -56,8 +67,3 @@ TI_WKS_BOOTLOADER_APPEND ?= ""
do_image_wic[depends] += "virtual/bootloader:do_deploy"
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
FALCON_INCLUDE = ""
FALCON_INCLUDE:ti-falcon = "conf/machine/include/ti-falcon.inc"
require ${FALCON_INCLUDE}

View File

@@ -1,5 +1,4 @@
IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
KERNEL_CLASSES:remove = "kernel-fit-extra-artifacts"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = "ti-kernel-fitimage"
KERNEL_CLASSES += "kernel-fitimage-legacyhs"
FIT_KERNEL_COMP_ALG = "none"
#KERNEL_CLASSES:remove = "kernel-fit-extra-artifacts"
#MACHINE_ESSENTIAL_EXTRA_RDEPENDS:remove = "ti-kernel-fitimage"
#KERNEL_CLASSES += "kernel-fitimage-legacyhs"
#FIT_KERNEL_COMP_ALG = "none"

View File

@@ -28,5 +28,5 @@ TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
EXTRA_OEMAKE += "${@ 'BL32_BASE=' + d.getVar('TFA_K3_BL32_BASE') if d.getVar('TFA_K3_BL32_BASE') else ''}"
EXTRA_OEMAKE += "${@ 'PRELOADED_BL33_BASE=' + d.getVar('TFA_K3_PRELOADED_BL33') if d.getVar('TFA_K3_PRELOADED_BL33') else ''}"
EXTRA_OEMAKE += "${@ 'K3_HW_CONFIG_BASE=' + d.getVar('TFA_K3_HW_CONFIG_BASE') if d.getVar('TFA_K3_HW_CONFIG_BASE') else ''}"
EXTRA_OEMAKE += "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
EXTRA_OEMAKE:append:ti-falcon = " PRELOADED_BL33_BASE=0x82000000 K3_HW_CONFIG_BASE=0x88000000"

View File

@@ -25,6 +25,21 @@ UBOOT_GIT_PROTOCOL ?= "https"
UBOOT_GIT_BRANCH ?= "branch=${BRANCH}"
SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH};name=uboot"
# Match the meta-ti trusted-firmware-a specific changes to memory locations
# for bl33 and k3 hardware.
TI_K3_TFA_CFG_FILES = "\
file://k3_tfa.cfg \
file://0001-env-Make-the-env-based-on-KConfig-instead-of-hardcod.patch \
"
TI_K3_TFA_CFG_FILES:remove:bsp-ti-6_12 = "file://0001-env-Make-the-env-based-on-KConfig-instead-of-hardcod.patch"
TI_K3_TFA_CFG_FILES:append:bsp-ti-6_12 = "\
file://0001-env-Make-the-env-based-on-KConfig-instead-of-hardcod-2025-01.patch \
file://0001-2025-01-env-Update-splashimage-for-am62-am62p.patch \
"
TI_K3_TFA_CFG_FILES:bsp-ti-6_6 = ""
SRC_URI:append:k3 = " ${TI_K3_TFA_CFG_FILES}"
SRCREV_FORMAT = "uboot"
PV:append = "+git"
@@ -403,18 +418,12 @@ do_deploy:append:am62pxx() {
install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
}
do_install:append:ti-falcon() {
do_install:append() {
if [ -f ${B}/tifalcon.bin ]; then
install -m 0644 ${B}/tifalcon.bin ${D}/boot
fi
}
FALCON_PKG = ""
FALCON_PKG:ti-falcon = "${PN}-falcon "
PACKAGES:prepend:am62xx-evm = "${FALCON_PKG} "
PACKAGES:prepend:am62axx-evm = "${FALCON_PKG} "
PACKAGES:prepend:am62pxx-evm = "${FALCON_PKG} "
PACKAGES:prepend:am62xx-lp-evm = "${FALCON_PKG} "
TOOLCHAIN = "gcc"
TI_SIGN_WITH_ECDSA_KEY ?= "SIGNING_KEY=${THISDIR}/files/custMpk_ecdsa.key"

View File

@@ -0,0 +1,45 @@
From 9f2d23951de3b8d80249e4ad82bcd49eb880d69d Mon Sep 17 00:00:00 2001
From: Ryan Eatmon <reatmon@ti.com>
Date: Tue, 3 Feb 2026 17:55:39 -0600
Subject: [PATCH] env: Update splashimage for am62/am62p
To support moving the TFA location for Yocto we need to also move the
splashimage to a new location.
Upstream-Status: Pending
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
board/ti/am62px/am62px.env | 2 +-
board/ti/am62x/am62x.env | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/ti/am62px/am62px.env b/board/ti/am62px/am62px.env
index 60674b21a9c..13e3c08294f 100644
--- a/board/ti/am62px/am62px.env
+++ b/board/ti/am62px/am62px.env
@@ -22,7 +22,7 @@ bootdir=/boot
rd_spec=-
splashfile=ti_logo_414x97_32bpp.bmp.gz
-splashimage=0x80200000
+splashimage=0x82180000
splashpos=m,m
splashsource=mmc
diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env
index 8e27a7a3e0a..5e657599669 100644
--- a/board/ti/am62x/am62x.env
+++ b/board/ti/am62x/am62x.env
@@ -23,7 +23,7 @@ bootdir=/boot
rd_spec=-
splashfile=ti_logo_414x97_32bpp.bmp.gz
-splashimage=0x80200000
+splashimage=0x82180000
splashpos=m,m
splashsource=mmc
--
2.43.0

View File

@@ -0,0 +1,32 @@
From 1cee5b419589234d575b5b513ff2030d08bda46c Mon Sep 17 00:00:00 2001
From: Ryan Eatmon <reatmon@ti.com>
Date: Wed, 4 Feb 2026 14:07:39 -0600
Subject: [PATCH] env: Make the env based on KConfig instead of hardcoded
testing...
Upstream-Status: Pending
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
include/env/ti/k3_dfu.env | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/env/ti/k3_dfu.env b/include/env/ti/k3_dfu.env
index d89f88631e3..e64a3427f6d 100644
--- a/include/env/ti/k3_dfu.env
+++ b/include/env/ti/k3_dfu.env
@@ -25,8 +25,8 @@ dfu_alt_info_ospi=
rootfs raw 0x800000 0x3800000
dfu_alt_info_ram=
- tispl.bin ram 0x80080000 0x200000;
- u-boot.img ram 0x81000000 0x400000
+ tispl.bin ram CONFIG_SPL_TEXT_BASE 0x200000;
+ u-boot.img ram CONFIG_TEXT_BASE 0x400000
dfu_alt_info_ospi_nand=
ospi_nand.tiboot3 part 1;
--
2.43.0

View File

@@ -0,0 +1,32 @@
From 25569d2b31a4dcb73bb55cffe13c95afd9441987 Mon Sep 17 00:00:00 2001
From: Ryan Eatmon <reatmon@ti.com>
Date: Wed, 4 Feb 2026 14:07:39 -0600
Subject: [PATCH] env: Make the env based on KConfig instead of hardcoded
testing...
Upstream-Status: Pending
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
include/env/ti/k3_dfu.env | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/env/ti/k3_dfu.env b/include/env/ti/k3_dfu.env
index 2ea8554d413..3a3eb959b94 100644
--- a/include/env/ti/k3_dfu.env
+++ b/include/env/ti/k3_dfu.env
@@ -25,8 +25,8 @@ dfu_alt_info_ospi=
rootfs raw 0x800000 0x3800000
dfu_alt_info_ram=
- tispl.bin ram 0x80080000 0x200000;
- u-boot.img ram 0x81000000 0x400000
+ tispl.bin ram CONFIG_SPL_TEXT_BASE 0x200000;
+ u-boot.img ram CONFIG_TEXT_BASE 0x400000
dfu_alt_info_ospi_nand=
ospi.tiboot3 part 1;
--
2.43.0

View File

@@ -0,0 +1,7 @@
CONFIG_TEXT_BASE=0x82f80000
CONFIG_BLOBLIST_ADDR=0x82c80000
CONFIG_SPL_TEXT_BASE=0x82000000
CONFIG_SPL_STACK_R_ADDR=0x83f80000
CONFIG_SPL_BSS_START_ADDR=0x82c00000
CONFIG_SPL_LOAD_FIT_ADDRESS=0x82f80000
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x82b00000