conf: Add support for bsp-ti-6_18 to ti-core-initramfs

With the 6.18 we are moving to using an initramfs to provide non-default
modules for booting.  So add that override to the machines that need it.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>

meta-ti-bsp/classes/ti-secdev.bbclass

@@ -3,13 +3,16 @@
 # K3 SECDEV scripts use OpenSSL
 DEPENDS:append:k3 = " openssl-native"
 DEPENDS:append:k3r5 = " openssl-native"
+DEPENDS:append:k3r5-falcon = " openssl-native"
 
 # Use package version of TI SECDEV for K3 if one is not provided through the environment
 DEPENDS:append:k3 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }"
 DEPENDS:append:k3r5 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }"
+DEPENDS:append:k3r5-falcon = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }"
 TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${datadir}/ti/ti-k3-secdev"
 TI_SECURE_DEV_PKG:k3 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
 TI_SECURE_DEV_PKG:k3r5 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
+TI_SECURE_DEV_PKG:k3r5-falcon = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
 
 # For non-K3 we require the SECDEV tools be provided through the environment with the following vars
 TI_SECURE_DEV_PKG:ti33x = "${TI_SECURE_DEV_PKG_CAT}/am3x"

meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf

@@ -4,6 +4,17 @@
 
 require conf/machine/include/k3r5.inc
 
+UBOOT_TEST_BUILD_CONFIGS ?= "usbdfu"
+UBOOT_TEST_BUILD_CONFIGS:bsp-ti-6_6 = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-next = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-mainline = ""
+
 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "${UBOOT_TEST_BUILD_CONFIGS} main"
+UBOOT_CONFIG[main] = "am62ax_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62ax_evm_r5_usbdfu_defconfig"
 
 UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf

@@ -4,6 +4,22 @@
 
 require conf/machine/include/k3r5.inc
 
-UBOOT_MACHINE = "am62px_evm_r5_defconfig"
+UBOOT_ECDSA_SIGN_CONFIG ?= "ecdsa"
+UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-next = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-mainline = ""
+
+UBOOT_TEST_BUILD_CONFIGS ?= "usbdfu"
+UBOOT_TEST_BUILD_CONFIGS:bsp-ti-6_6 = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-next = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-mainline = ""
+
+UBOOT_MACHINE = ""
+UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} main"
+UBOOT_CONFIG:prepend:tie-test-builds = "${UBOOT_TEST_BUILD_CONFIGS} "
+
+UBOOT_CONFIG[main] = "am62px_evm_r5_defconfig"
+UBOOT_CONFIG[ecdsa] = "am62px_evm_r5_defconfig,,,${TI_SIGN_WITH_ECDSA_KEY}"
+UBOOT_CONFIG[usbdfu] = "am62px_evm_r5_usbdfu_defconfig"
 
 UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am62pxx-evm.conf

@@ -23,7 +23,22 @@ KERNEL_DEVICETREE = " \
 
 FIT_CONF_DEFAULT_DTB = "k3-am62p5-sk.dtb"
 
-UBOOT_MACHINE = "am62px_evm_a53_defconfig"
+UBOOT_ECDSA_SIGN_CONFIG ?= "ecdsa"
+UBOOT_ECDSA_SIGN_CONFIG:bsp-ti-6_6 = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-next = ""
+UBOOT_ECDSA_SIGN_CONFIG:bsp-mainline = ""
+
+ECDSA_BOOT_FILES ?= "tiboot3.bin-ecdsa tiboot3-*-evm.bin-ecdsa tispl.bin-ecdsa u-boot.img-ecdsa"
+ECDSA_BOOT_FILES:bsp-ti-6_6 = ""
+ECDSA_BOOT_FILES:bsp-next = ""
+ECDSA_BOOT_FILES:bsp-mainline = ""
+
+UBOOT_MACHINE = ""
+UBOOT_CONFIG = "${UBOOT_ECDSA_SIGN_CONFIG} main"
+UBOOT_CONFIG[main] = "am62px_evm_a53_defconfig"
+UBOOT_CONFIG[ecdsa] = "am62px_evm_a53_defconfig,,,${TI_SIGN_WITH_ECDSA_KEY}"
+
+IMAGE_BOOT_FILES += "${ECDSA_BOOT_FILES}"
 
 # UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
 # along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc

meta-ti-bsp/conf/machine/am62xx-evm-k3-falcon.conf

@@ -0,0 +1,51 @@
+#@TYPE: Machine
+#@NAME: AM62XX EVM
+#@DESCRIPTION: Machine configuration for the TI AM62XX EVM
+
+require conf/machine/include/k3-falcon.inc
+
+SOC_FAMILY:append = ":k3"
+SOC_FAMILY:append = ":am62xx"
+
+MACHINE_FEATURES += "screen"
+
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
+
+# Bitmap image tarball for early splashscreen
+IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
+
+TFA_BOARD = "lite"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
+OPTEEMACHINE = "k3-am62x"
+
+KERNEL_DEVICETREE_PREFIX = " \
+    ti/k3-am625 \
+    ti/k3-am62x-sk \
+"
+
+KERNEL_DEVICETREE = " \
+    ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
+    ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
+    ti/k3-am625-beagleplay.dtb \
+    ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo \
+    ti/k3-am625-phyboard-lyra-rdk.dtb \
+    ti/k3-am625-sk.dtb \
+    ti/k3-am625-verdin-nonwifi-dahlia.dtb \
+    ti/k3-am625-verdin-nonwifi-dev.dtb \
+    ti/k3-am625-verdin-nonwifi-mallow.dtb \
+    ti/k3-am625-verdin-nonwifi-yavia.dtb \
+    ti/k3-am625-verdin-wifi-dahlia.dtb \
+    ti/k3-am625-verdin-wifi-dev.dtb \
+    ti/k3-am625-verdin-wifi-mallow.dtb \
+    ti/k3-am625-verdin-wifi-yavia.dtb \
+    ti/k3-am62x-sk-csi2-imx219.dtbo \
+    ti/k3-am62x-sk-csi2-ov5640.dtbo \
+    ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
+    ti/k3-am62x-sk-hdmi-audio.dtbo \
+"
+
+FIT_CONF_DEFAULT_DTB = "k3-am625-sk.dtb"
+
+UBOOT_MACHINE = "am62x_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am62xx-evm-k3r5-falcon.conf

@@ -0,0 +1,8 @@
+require conf/machine/include/k3r5-falcon.inc
+require conf/machine/include/am62xx-k3r5.inc
+
+UBOOT_CONFIG_FRAGMENTS = "k3_r5_falcon.config"
+
+TI_UPSTREAM_TOOLS_MACHINE = "am62xx-evm-k3r5"
+
+UBOOT_CONFIG:remove:k3r5-falcon = "${UBOOT_TEST_BUILD_CONFIGS}"

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf

@@ -3,7 +3,4 @@
 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
 
 require conf/machine/include/k3r5.inc
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+require conf/machine/include/am62xx-k3r5.inc

meta-ti-bsp/conf/machine/am62xx-evm.conf

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

meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf

@@ -4,6 +4,17 @@
 
 require conf/machine/include/k3r5.inc
 
+UBOOT_TEST_BUILD_CONFIGS ?= "usbdfu"
+UBOOT_TEST_BUILD_CONFIGS:bsp-ti-6_6 = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-next = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-mainline = ""
+
 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "${UBOOT_TEST_BUILD_CONFIGS} main"
+UBOOT_CONFIG[main] = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62x_lpsk_r5_usbdfu_defconfig"
 
 UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf

@@ -5,3 +5,9 @@
 require conf/machine/include/k3r5.inc
 
 UBOOT_MACHINE = "am65x_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG ??= ""
+UBOOT_CONFIG:tie-test-builds = "usbdfu main"
+UBOOT_CONFIG[main] = "am65x_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am65x_evm_r5_usbdfu_defconfig"

meta-ti-bsp/conf/machine/include/am62axx.inc

@@ -12,5 +12,6 @@ OPTEEMACHINE = "k3-am62x"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
 
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
-TI_INITRAMFS_KERNEL_MODULES:append:bsp-next  = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-ti-6_18 = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-tps6594-i2c kernel-module-tps6594-regulator kernel-module-tps6594-core"

meta-ti-bsp/conf/machine/include/am62xx-k3r5.inc

@@ -0,0 +1,14 @@
+UBOOT_TEST_BUILD_CONFIGS ?= "usbdfu"
+UBOOT_TEST_BUILD_CONFIGS:bsp-ti-6_6 = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-next = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-mainline = ""
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "${UBOOT_TEST_BUILD_CONFIGS} main"
+UBOOT_CONFIG[main] = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62x_evm_r5_usbdfu_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"

meta-ti-bsp/conf/machine/include/j721e.inc

@@ -20,5 +20,6 @@ TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}"
 
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-ti-6_18 = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"

meta-ti-bsp/conf/machine/include/j784s4.inc

@@ -14,5 +14,6 @@ OPTEEMACHINE = "k3-j784s4"
 
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
 
+TI_INITRAMFS_KERNEL_MODULES:append:bsp-ti-6_18 = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-mainline = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"
 TI_INITRAMFS_KERNEL_MODULES:append:bsp-next = " kernel-module-cdns-pltfrm kernel-module-ti-j721e-ufs"

meta-ti-bsp/conf/machine/include/k3-falcon.inc

@@ -0,0 +1,37 @@
+# TI K3 Aarch64 profile for Cortex-A53/A72 cores
+
+require conf/machine/include/ti-soc.inc
+SOC_FAMILY:append = ":k3-falcon"
+
+DEFAULTTUNE ?= "aarch64"
+require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
+
+require conf/machine/include/ti-bsp.inc
+
+KERNEL_IMAGETYPE = "Image"
+KERNEL_CLASSES += "kernel-fit-extra-artifacts"
+
+UBOOT_ARCH = "arm"
+UBOOT_DTB_LOADADDRESS = "0x88000000"
+UBOOT_DTBO_LOADADDRESS = "0x88080000"
+UBOOT_DTBO_OFFSET = "0x00010000"
+
+SPL_BINARY = "tispl.bin"
+SPL_BINARYNAME = "tispl.bin"
+UBOOT_SUFFIX = "img"
+
+FIT_KERNEL_SIGN_ENABLE = "1"
+FIT_KERNEL_SIGN_KEYNAME ?= "custMpk"
+FIT_KERNEL_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
+UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
+FIT_HASH_ALG ?= "sha512"
+FIT_SIGN_ALG ?= "rsa4096"
+
+TFA_PLATFORM = "k3"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"
+
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+

meta-ti-bsp/conf/machine/include/k3r5-falcon.inc

@@ -0,0 +1,22 @@
+# TI K3 Armv7 profile for Cortex-R5F cores
+
+require conf/machine/include/ti-soc.inc
+SOC_FAMILY:append = ":k3r5-falcon"
+
+# The closest of existing tunes for Cortex-R5F
+DEFAULTTUNE = "armv7athf"
+require conf/machine/include/arm/armv7a/tune-cortexa8.inc
+
+# R5 runs early bootloader and loads SYSFW
+# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst
+# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst
+# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst
+
+require conf/machine/include/ti-bsp.inc
+PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
+
+UBOOT_SUFFIX = "bin"
+UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
+
+PACKAGECONFIG:pn-u-boot-ti-staging = ""
+PACKAGECONFIG:pn-u-boot-ti-mainline = ""

meta-ti-bsp/conf/machine/include/mc_k3-falcon.inc

@@ -0,0 +1,3 @@
+BBMULTICONFIG += "k3-falcon"
+
+do_image[mcdepends] += "mc::k3-falcon:virtual/bootloader:do_deploy"

meta-ti-bsp/conf/machine/include/mc_k3r5-falcon.inc

@@ -0,0 +1,3 @@
+BBMULTICONFIG += "k3r5-falcon"
+
+do_image[mcdepends] += "mc::k3r5-falcon:virtual/bootloader:do_deploy"

meta-ti-bsp/conf/machine/include/ti-soc.inc

@@ -33,14 +33,17 @@ BUILD_CORE_INITRAMFS_IMAGE = "ti-core-initramfs"
 BUILD_CORE_INITRAMFS_IMAGE_FILE = "${BUILD_CORE_INITRAMFS_IMAGE}.cpio.xz"
 
 BUILD_CORE_INITRAMFS_IMAGE_STEP ?= ""
+BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-ti-6_18 = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
 BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-mainline = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
 BUILD_CORE_INITRAMFS_IMAGE_STEP:bsp-next = "${BUILD_CORE_INITRAMFS_IMAGE}:do_image_complete"
 
 do_image_wic[depends] += "${BUILD_CORE_INITRAMFS_IMAGE_STEP}"
 
 TI_WKS_INITRAMFS ?= ""
+TI_WKS_INITRAMFS:bsp-ti-6_18 = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 TI_WKS_INITRAMFS:bsp-mainline = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 TI_WKS_INITRAMFS:bsp-next = ",initrd=${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 
+IMAGE_BOOT_FILES:append:bsp-ti-6_18 = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 IMAGE_BOOT_FILES:append:bsp-mainline = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"
 IMAGE_BOOT_FILES:append:bsp-next = " ${BUILD_CORE_INITRAMFS_IMAGE_FILE}"

meta-ti-bsp/conf/machine/j784s4-evm.conf

@@ -26,4 +26,15 @@ KERNEL_DEVICETREE = " \
     ti/k3-j784s4-evm.dtb \
 "
 
+UBOOT_TEST_BUILD_CONFIGS ?= "k3_bist"
+UBOOT_TEST_BUILD_CONFIGS:bsp-ti-6_6 = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-next = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-mainline = ""
+
 UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG ??= ""
+UBOOT_CONFIG:tie-test-builds = "${UBOOT_TEST_BUILD_CONFIGS} main"
+UBOOT_CONFIG[main] = "j784s4_evm_a72_defconfig"
+UBOOT_CONFIG[k3_bist] = "j784s4_evm_a72_k3_bist_defconfig"

meta-ti-bsp/conf/multiconfig/k3-falcon.conf

@@ -0,0 +1,9 @@
+MAINMACHINE := "${MACHINE}"
+
+DEPLOY_DIR_IMAGE:k3-falcon = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}"
+
+MACHINE:append = "-k3-falcon"
+TI_TMPDIR_APPEND ?= "-k3-falcon"
+TMPDIR:append = "${TI_TMPDIR_APPEND}"
+
+SDKPKGSUFFIX = "k3-falcon-nativesdk"

meta-ti-bsp/conf/multiconfig/k3r5-falcon.conf

@@ -0,0 +1,10 @@
+MAINMACHINE := "${MACHINE}"
+
+DEPLOY_DIR_IMAGE:k3r5-falcon = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}"
+
+MACHINE:append = "-k3r5-falcon"
+TCLIBC = "baremetal"
+TI_TMPDIR_APPEND ?= "-k3r5-falcon"
+TMPDIR:append = "${TI_TMPDIR_APPEND}"
+
+SDKPKGSUFFIX = "k3r5-falcon-nativesdk"

meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb

@@ -83,6 +83,10 @@ do_deploy() {
     done
 }
 
+do_deploy:k3-falcon() {
+    echo "Deploy nothing for k3-falcon"
+}
+
 # Set up names for the firmwares
 ALTERNATIVE:${PN}:am62xx  = "am62-main-r5f0_0-fw"
 ALTERNATIVE:${PN}:am62pxx  = "am62p-main-r5f0_0-fw"

meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc

@@ -20,6 +20,7 @@ COMPATIBLE_MACHINE = "k3"
 
 TFA_BUILD_TARGET = "all"
 TFA_INSTALL_TARGET = "bl31"
+TFA_INSTALL_SUFFIX:k3-falcon = "-falcon"
 TFA_SPD = "opteed"
 
 # For am62lxx, install bl1 & bl31 using TFA_INSTALL_TARGET
@@ -29,6 +30,7 @@ EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_
 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_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
+EXTRA_OEMAKE:append:k3-falcon = " PRELOADED_BL33_BASE=0x82000000 K3_HW_CONFIG_BASE=0x88000000"
 EXTRA_OEMAKE:append:ti-falcon = " PRELOADED_BL33_BASE=0x82000000 K3_HW_CONFIG_BASE=0x88000000"
 
 # LPM support patches for Jacinto platforms (J7200, J742S2, J784S4)

meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend

@@ -1,4 +1,4 @@
-TFA_TI = ""
-TFA_TI:k3 = "trusted-firmware-a-ti.inc"
+TRUSTED_FIRMWARE_A_TI = ""
+TRUSTED_FIRMWARE_A_TI:ti-soc = "trusted-firmware-a-ti.inc"
 
-require ${TFA_TI}
+require ${TRUSTED_FIRMWARE_A_TI}

meta-ti-bsp/recipes-bsp/u-boot/files/custMpk_ecdsa.key

@@ -0,0 +1,6 @@
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDBDO9fzBU2LoKaYgji4m3ZCHKUBF9CTVnU6ClfNPJsTo0SKZpCsmyr0
+TKUNkk16vwGgBwYFK4EEACKhZANiAATCv6ftwnJW91fP5wpLpLAxt3u732oNnKr8
+pLbZUzi/s8/e7QiISJ8QKYGaWMnjORW82cM3UJKlCw8GOrb3ZrEXYWRKxkPWql0+
+BOhDQA5b21GtL9HQPvuCPz471ZaxGYA=
+-----END EC PRIVATE KEY-----

meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc

@@ -8,3 +8,30 @@ BRANCH:tie-jailhouse:bsp-ti-6_12 = "ti-u-boot-2025.01-jailhouse"
 SRCREV_uboot:tie-jailhouse:bsp-ti-6_12 = "e718bbcec3ebf663c021839753034a224be4cc53"
 
 UBOOT_GIT_URI:tie-jailhouse = "git://git.ti.com/git/processor-sdk/u-boot.git"
+
+#
+# Test builds settings
+#
+TI_UPSTREAM_TOOLS_INCLUDE ?= ""
+TI_UPSTREAM_TOOLS_INCLUDE:tie-test-builds = "recipes-ti/ti-upstream-tools/ti-upstream-tools.inc"
+require ${TI_UPSTREAM_TOOLS_INCLUDE}
+
+SRC_URI:append:tie-test-builds = " ${TI_UPSTREAM_TOOLS_SRC_URI}"
+SRCREV_ti-upstream-tools:tie-test-builds = "${TI_UPSTREAM_TOOLS_SRCREV}"
+SRCREV_FORMAT:tie-test-builds = "uboot_ti-upstream-tools"
+
+TI_UPSTREAM_TOOLS_MACHINE ?= "${MACHINE}"
+
+do_configure:prepend:tie-test-builds() {
+    ${UNPACKDIR}/ti-upstream-tools/uboot-configs/generate_configs.sh \
+        --uboot-src "${S}" \
+        --output-dir "${B}/test-build-configs" \
+        --yocto-machine "${TI_UPSTREAM_TOOLS_MACHINE}"
+
+    for lpConfig in ${B}/test-build-configs/*; do
+        if [ -f $lpConfig ]; then
+            echo "Copy generated config: $lpConfig -> ${S}/configs"
+            cp $lpConfig ${S}/configs
+        fi
+    done
+}

meta-ti-bsp/recipes-bsp/u-boot/u-boot-mergeconfig.inc

@@ -1,7 +1,15 @@
-do_configure:append () {
+uboot_configure:append () {
    if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ] && [ -n "${UBOOT_MACHINE}" ]
    then
-       oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
-       oe_runmake -C ${S} O=${B} olddefconfig
+       oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} ${UBOOT_MACHINE} ${UBOOT_CONFIG_FRAGMENTS}
+       oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} olddefconfig
+   fi
+}
+
+uboot_configure_config:append () {
+
+   if [ -n "${UBOOT_CONFIG_FRAGMENTS}" ]; then
+       oe_runmake -C ${S} O=${B}/${builddir} ${config_make_opts} ${UBOOT_MAKE_OPTS} ${config} ${UBOOT_CONFIG_FRAGMENTS}
+       oe_runmake -C ${S} O=${B}/${builddir} ${config_make_opts} ${UBOOT_MAKE_OPTS} olddefconfig
    fi
 }

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb

@@ -1,7 +1,5 @@
 require u-boot-ti.inc
 
-include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
-
 PR = "r0"
 
 BRANCH = "ti-u-boot-2024.04"

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb

@@ -1,7 +1,5 @@
 require u-boot-ti.inc
 
-include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
-
 PR = "r0"
 
 BRANCH = "ti-u-boot-2025.01"

meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc

@@ -11,8 +11,6 @@ require u-boot-mergeconfig.inc
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
 
-FILES:${PN}-falcon = "boot/tifalcon.bin"
-
 SUMMARY = "u-boot bootloader for TI devices"
 
 LICENSE = "GPL-2.0-or-later"
@@ -40,6 +38,7 @@ DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-n
 # SYSFW/TIFS Firmware
 DEPENDS:append:k3 = " ti-sci-fw"
 DEPENDS:append:k3r5 = " ti-sci-fw"
+DEPENDS:append:k3r5-falcon = " ti-sci-fw"
 
 # HSM Demo Firmware is only applicable for J721S2 & J784S4 devices
 DEPENDS:append:j721s2 = " ti-hsm-demo-fw"
@@ -67,6 +66,7 @@ PLAT_SFX:am62pxx = "am62pxx"
 ATF_BL1_PATH = "${STAGING_DIR_HOST}/firmware/trusted-firmware-a/bl1.bin"
 
 ATF_BL31_PATH = "${STAGING_DIR_HOST}/firmware/trusted-firmware-a/bl31.bin"
+ATF_BL31_PATH:k3-falcon = "${STAGING_DIR_HOST}/firmware/trusted-firmware-a/bl31-falcon.bin"
 
 OPTEE_BL32_PATH = "${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin"
 
@@ -109,6 +109,7 @@ SYSROOT_DIRS += "/boot"
 # SPL (Second Program Loader) to be loaded over UART
 SPL_UART_BINARY = "u-boot-spl.bin"
 SPL_UART_BINARY:k3r5 = ""
+SPL_UART_BINARY:k3r5-falcon = ""
 
 SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${UBOOT_VERSION}"
 SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
@@ -150,13 +151,37 @@ uboot_compile_config_copy_binary:k3r5 () {
 
     builddir="${builddir}"
 
-    if ! [ -L ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
-        ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
+    if ! [ -L ${B}/${builddir}/${binary} ] && ! [ -f ${B}/${builddir}/${binary} ]; then
+        ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${binary}
     fi
 
+    if ! [ -L ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
+        tgt="${B}/${builddir}/${binary}"
+        if [ -L ${B}/${builddir}/${binary} ]; then
+            tgt=$(realpath ${B}/${builddir}/${binary})
+        fi
+        ln -s ${tgt} ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
+    fi
+}
+
+uboot_compile_config_copy_binary:k3r5-falcon () {
+    config=$1
+    type=$2
+    binary=$3
+
+    builddir="${builddir}"
+
     if ! [ -L ${B}/${builddir}/${binary} ] && ! [ -f ${B}/${builddir}/${binary} ]; then
         ln -s ${B}/${builddir}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${builddir}/${binary}
     fi
+
+    if ! [ -L ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
+        tgt="${B}/${builddir}/${binary}"
+        if [ -L ${B}/${builddir}/${binary} ]; then
+            tgt=$(realpath ${B}/${builddir}/${binary})
+        fi
+        ln -s ${tgt} ${B}/${builddir}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
+    fi
 }
 
 uboot_install_config:append () {
@@ -228,20 +253,104 @@ do_deploy:append:k3r5 () {
 	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${UBOOT_VERSION}*
 }
 
+do_deploy:append:k3r5-falcon () {
+	rm -f ${DEPLOYDIR}/u-boot-initial-env*
+	rm -f ${DEPLOYDIR}/${PN}-initial-env*
+	rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}*
+	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}*
+	rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${UBOOT_VERSION}*
+	rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${UBOOT_VERSION}*
+}
+
 uboot_deploy_config:append:k3r5 () {
 	for f in ${B}/${builddir}/tiboot3-*.bin; do
-		if [ -f "$f" ]; then
+		if [ -L "$f" ]; then
 			f_base=$(basename $f)
-			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
-			ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			tgt=$(realpath $f)
+			tgt_base=$(basename $tgt)
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}-${type}
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}
+		else
+			if [ -f "$f" ]; then
+				f_base=$(basename $f)
+				install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
+				ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			fi
 		fi
 	done
 
 	for f in ${B}/${builddir}/sysfw*.itb; do
-		if [ -f "$f" ]; then
+		if [ -L "$f" ]; then
 			f_base=$(basename $f)
-			install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
-			ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			tgt=$(realpath $f)
+			tgt_base=$(basename $tgt)
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}-${type}
+			ln -sf ${tgt_base}-${type} ${DEPLOYDIR}/${f_base}
+		else
+			if [ -f "$f" ]; then
+				f_base=$(basename $f)
+				install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
+				ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
+			fi
+		fi
+	done
+}
+
+uboot_deploy_config:append:k3r5-falcon () {
+    #---------------------------------------------------------------------
+    # Clean up the existing deployed files to have the -falcon suffix.
+    #---------------------------------------------------------------------
+    cd ${DEPLOYDIR}
+    mv ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX} ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX}-falcon
+    rm ${UBOOT_SYMLINK}-${type}
+    rm ${UBOOT_SYMLINK}
+    rm ${UBOOT_BINARY}-${type}
+    rm ${UBOOT_BINARY}
+    ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX}-falcon ${UBOOT_SYMLINK}-${type}-falcon
+    ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX}-falcon ${UBOOT_SYMLINK}-falcon
+    ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX}-falcon ${UBOOT_BINARY}-${type}-falcon
+    ln -sf ${UBOOT_BINARYNAME}-${type}-${UBOOT_VERSION}.${UBOOT_SUFFIX}-falcon ${UBOOT_BINARY}-falcon
+
+    # Deploy the uboot-initial-env
+    if [ -n "${UBOOT_INITIAL_ENV}" ]; then
+        cd ${DEPLOYDIR}
+        mv ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION} ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION}-falcon
+        rm ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
+        rm ${UBOOT_INITIAL_ENV}-${type}
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION}-falcon ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-falcon
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${UBOOT_VERSION}-falcon ${UBOOT_INITIAL_ENV}-${type}-falcon
+    fi
+    #---------------------------------------------------------------------
+    # Done cleaning up
+    #---------------------------------------------------------------------
+
+	for f in ${B}/${builddir}/tiboot3-*.bin; do
+		if [ -L "$f" ]; then
+			f_base=$(basename $f)
+			tgt=$(realpath $f)
+			tgt_base=$(basename $tgt)
+			ln -sf ${tgt_base}-${type}-falcon ${DEPLOYDIR}/${f_base}-${type}-falcon
+		else
+			if [ -f "$f" ]; then
+				f_base=$(basename $f)
+				install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}-falcon
+				ln -sf ${f_base}-${type}-falcon ${DEPLOYDIR}/${f_base}-falcon
+			fi
+		fi
+	done
+
+	for f in ${B}/${builddir}/sysfw*.itb; do
+		if [ -L "$f" ]; then
+			f_base=$(basename $f)
+			tgt=$(realpath $f)
+			tgt_base=$(basename $tgt)
+			ln -sf ${tgt_base}-${type}-falcon ${DEPLOYDIR}/${f_base}-${type}-falcon
+		else
+			if [ -f "$f" ]; then
+				f_base=$(basename $f)
+				install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}-falcon
+				ln -sf ${f_base}-${type}-falcon ${DEPLOYDIR}/${f_base}-falcon
+			fi
 		fi
 	done
 }
@@ -259,13 +368,54 @@ uboot_deploy_config:append:am62lxx () {
 uboot_deploy:append:k3r5 () {
     for f in ${B}/tiboot3-*.bin; do
 		if [ -f "$f" ]; then
-			install -m 644 $f ${DEPLOYDIR}/
+			f_base=$(basename $f)
+			install -m 644 $f ${DEPLOYDIR}/${f_base}
 		fi
 	done
 
 	for f in ${B}/sysfw*.itb; do
 		if [ -f "$f" ]; then
-			install -m 644 $f ${DEPLOYDIR}/
+			f_base=$(basename $f)
+			install -m 644 $f ${DEPLOYDIR}/${f_base}
+		fi
+	done
+}
+
+uboot_deploy:append:k3r5-falcon () {
+    #---------------------------------------------------------------------
+    # Clean up the existing deployed files to have the -falcon suffix.
+    #---------------------------------------------------------------------
+    cd ${DEPLOYDIR}
+    mv ${UBOOT_IMAGE} ${UBOOT_IMAGE}-falcon
+    rm ${UBOOT_SYMLINK}
+    rm ${UBOOT_BINARY}
+    ln -sf ${UBOOT_IMAGE}-falcon ${UBOOT_SYMLINK}-falcon
+    ln -sf ${UBOOT_IMAGE}-falcon ${UBOOT_BINARY}-falcon
+
+    # Deploy the uboot-initial-env
+    if [ -n "${UBOOT_INITIAL_ENV}" ]; then
+        cd ${DEPLOYDIR}
+        mv ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION} ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION}-falcon
+        rm ${UBOOT_INITIAL_ENV}-${MACHINE}
+        rm ${UBOOT_INITIAL_ENV}
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION}-falcon ${UBOOT_INITIAL_ENV}-${MACHINE}-falcon
+        ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${UBOOT_VERSION}-falcon ${UBOOT_INITIAL_ENV}-falcon
+    fi
+    #---------------------------------------------------------------------
+    # Done cleaning up
+    #---------------------------------------------------------------------
+
+    for f in ${B}/tiboot3-*.bin; do
+		if [ -f "$f" ]; then
+			f_base=$(basename $f)
+			install -m 644 $f ${DEPLOYDIR}/${f_base}-falcon
+		fi
+	done
+
+	for f in ${B}/sysfw*.itb; do
+		if [ -f "$f" ]; then
+			f_base=$(basename $f)
+			install -m 644 $f ${DEPLOYDIR}/${f_base}-falcon
 		fi
 	done
 }
@@ -380,6 +530,23 @@ do_deploy:append:am62pxx() {
 	install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
 }
 
+do_install:k3-falcon() {
+	install -d ${D}/boot
+	install -m 0644 ${B}/tifalcon.bin ${D}/boot
+}
+
+do_deploy:k3-falcon() {
+	install -d ${DEPLOYDIR}
+	install -m 0644 ${B}/tifalcon.bin ${DEPLOYDIR}
+}
+
+do_deploy:append:k3-falcon() {
+    if [ -f ${DEPLOYDIR}/ti_logo_414x97_32bpp.bmp.gz ]; then
+        rm ${DEPLOYDIR}/ti_logo_414x97_32bpp.bmp.gz
+    fi
+}
+
+# Remove once we get the mc:k3r5-falcon flow working...
 do_install:append:ti-falcon() {
 	install -m 0644 ${B}/tifalcon.bin ${D}/boot
 }
@@ -392,4 +559,10 @@ PACKAGES:prepend:am62axx-evm = "${FALCON_PKG} "
 PACKAGES:prepend:am62pxx-evm = "${FALCON_PKG} "
 PACKAGES:prepend:am62xx-lp-evm = "${FALCON_PKG} "
 
+FILES:${PN}-falcon = " boot/tifalcon.bin"
+
 TOOLCHAIN = "gcc"
+
+include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
+
+TI_SIGN_WITH_ECDSA_KEY ?= "KEY_PATH=${THISDIR}/files/custMpk_ecdsa.key"

meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc

@@ -69,8 +69,16 @@ do_deploy:append:am57xx() {
 }
 
 do_deploy:append:k3() {
-    ln -sf optee/bl32.bin ${DEPLOYDIR}/
-    ln -sf optee/bl32.elf ${DEPLOYDIR}/
+    if [ -f ${DEPLOYDIR}/optee/bl32.bin ]; then
+        ln -sf optee/bl32.bin ${DEPLOYDIR}/
+    fi
+    if [ -f ${DEPLOYDIR}/optee/bl32.elf ]; then
+        ln -sf optee/bl32.elf ${DEPLOYDIR}/
+    fi
+}
+
+do_deploy:k3-falcon() {
+    echo "Deploy nothing for k3-falcon"
 }
 
 # Make the OS depend on embedded TAs

meta-ti-bsp/recipes-security/optee/optee-test-ti-overrides.inc

@@ -0,0 +1,2 @@
+do_deploy:k3-falcon() {
+}

meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend

@@ -2,3 +2,8 @@ OPTEE_TI_VERSION = ""
 OPTEE_TI_VERSION:ti-soc = "${BPN}-ti-version.inc"
 
 require ${OPTEE_TI_VERSION}
+
+OPTEE_TI_OVERRIDES = ""
+OPTEE_TI_OVERRIDES:ti-soc = "${BPN}-ti-overrides.inc"
+
+require ${OPTEE_TI_OVERRIDES}

meta-ti-bsp/recipes-ti/initramfs/packagegroup-ti-core-initramfs.bb

@@ -1,16 +1,18 @@
 SUMMARY = "Minimal initramfs for boot requirements"
 
-require recipes-core/packagegroups/packagegroup-core-boot.bb
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
 
 TI_INITRAMFS_KERNEL_MODULES ?= ""
 
 RDEPENDS:${PN} += "\
     ${TI_INITRAMFS_KERNEL_MODULES} \
+    ${VIRTUAL-RUNTIME_base-utils} \
+    base-passwd \
     initramfs-framework-base \
     initramfs-module-udev \
     initramfs-module-nfsrootfs \
-    nfs-utils \
-    nfs-utils-client \
 "
-
-RDEPENDS:${PN}:remove = "grub-efi kernel"

meta-ti-bsp/recipes-ti/initramfs/ti-core-initramfs.bb

@@ -7,29 +7,26 @@ DESCRIPTION = "Image meant to probe boot essential modules\
 
 LICENSE = "MIT"
 
-inherit core-image
+INITRAMFS_FSTYPES = "cpio cpio.xz"
+
+INITRAMFS_MAXSIZE = "65536"
 
 IMAGE_NAME = "ti-core-initramfs"
 
-IMAGE_NAME_SUFFIX = ""
-
-IMAGE_FEATURES:remove = "package-management"
-
-INITRAMFS_FSTYPES = "cpio cpio.xz"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+export IMAGE_BASENAME = "${IMAGE_NAME}"
 
 PACKAGE_INSTALL = "packagegroup-ti-core-initramfs"
 
-export IMAGE_BASENAME = "${IMAGE_NAME}"
+# Ensure the initramfs only contains the bare minimum
+IMAGE_FEATURES = ""
+IMAGE_LINGUAS = ""
 
-IMAGE_OVERHEAD_FACTOR = "1.1"
+# on the kernel image.
+PACKAGE_EXCLUDE = "kernel-image-*"
 
-# To further reduce the size of the rootfs, remove the /boot directory from
-# the final image this is usually done by adding RDEPENDS_kernel-base = ""
-# in the configuration file. In our case we can't use this method. Instead we
-# just wipe out the content of "/boot" before creating the image.
-ROOTFS_POSTPROCESS_COMMAND += "empty_boot_dir; "
-empty_boot_dir () {
-	rm -rf ${IMAGE_ROOTFS}/boot/*
-}
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+IMAGE_NAME_SUFFIX ?= ""
+IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
+inherit image

meta-ti-bsp/recipes-ti/ti-upstream-tools/ti-upstream-tools.inc

@@ -0,0 +1,2 @@
+TI_UPSTREAM_TOOLS_SRC_URI = "git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;protocol=https;branch=master;name=ti-upstream-tools;destsuffix=ti-upstream-tools"
+TI_UPSTREAM_TOOLS_SRCREV = "54411cac5a67e061685f1aef12fdb6a91d8aef25"