16 files changed, 38 insertions, 47 deletions
diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
index ca102961..652496c2 100644
--- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
@@ -10,11 +10,6 @@ UBOOT_CONFIG ??= "uart mmc"
 UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
 UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
 # FIT image for legacy secure devices
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
index 632b4995..fde38d39 100644
--- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/am437x-evm.conf
 UBOOT_MACHINE = "am43xx_hs_evm_config"
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
 OPTEEMACHINE = "ti-am43xx"
 OPTEEFLAVOR = "am43xx"
diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
index 4f36a847..fcdc5c0b 100644
--- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/am57xx-evm.conf
 UBOOT_MACHINE = "am57xx_hs_evm_config"
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
 OPTEEMACHINE = "ti-am57xx"
 OPTEEFLAVOR = "am57xx"
 OPTEEPAGER = "y"
diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
index 8e57a154..37ffef31 100644
--- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/dra7xx-evm.conf
 UBOOT_MACHINE = "dra7xx_hs_evm_config"
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
 OPTEEMACHINE = "ti-dra7xx"
 OPTEEFLAVOR = "dra7xx"
 OPTEEPAGER = "y"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 9b85f867..7ec6b51e 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -13,18 +13,18 @@ KERNEL_IMAGETYPES = "Image fitImage"
 KERNEL_CLASSES += "kernel-fitimage"
 UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x81000000"
+UBOOT_DTB_LOADADDRESS = "0x88000000"
-UBOOT_LOADADDRESS = "0x81000000"
+UBOOT_DTBO_LOADADDRESS = "0x88080000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET = "0x00010000"
 SPL_BINARY = "tispl.bin"
 SPL_BINARYNAME = "tispl.bin"
 UBOOT_SUFFIX = "img"
+UBOOT_SIGN_ENABLE = "1"
+UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
+UBOOT_SIGN_KEYNAME ?= "custMpk"
+UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
 FIT_HASH_ALG ?= "sha512"
 FIT_SIGN_ALG ?= "rsa4096"
diff --git a/meta-ti-bsp/conf/machine/include/ti-falcon.inc b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
index 0b938470..84a62b22 100644
--- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
@@ -1,6 +1,4 @@
 IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
 KERNEL_CLASSES:remove = "kernel-fitimage"
 KERNEL_CLASSES += "kernel-fitimage-legacyhs"
-UBOOT_DTB_LOADADDRESS = "0x88000000"
-UBOOT_LOADADDRESS = "0x82000000"
 FIT_KERNEL_COMP_ALG = "none"
diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc
index 5d77e719..5125856f 100644
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -3,6 +3,12 @@
 SOC_FAMILY = "ti-soc"
 require conf/machine/include/soc-family.inc
+# kernel, initrd load addresses for the fitImage in all TI platforms
+UBOOT_ENTRYPOINT = "0x82000000"
+UBOOT_LOADADDRESS = "0x82000000"
+UBOOT_RD_LOADADDRESS = "0x84000000"
+UBOOT_RD_ENTRYPOINT = "0x84000000"
 # TI platforms all use devicetrees with overlays
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
 KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 61364c66..b22585ff 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -15,11 +15,11 @@ CADENCE_MHDP_FW_VERSION = "2.1.0"
 IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.8"
 TI_DM_FW_VERSION = "11.00.09"
-TI_SYSFW_VERSION = "11.01.00"
+TI_SYSFW_VERSION = "11.01.02"
 TI_HSM_DEMO_FW_VERSION = "11.00.09"
 TAD5212_FW_VERSION = "1.0.0.0"
-TI_LINUX_FW_SRCREV ?= "e594deb508a322d5681888d48fbb153953b06ca9"
+TI_LINUX_FW_SRCREV ?= "33bec0e2ea9a25362c0c8243b2f1ed392dbc5b02"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 BRANCH ?= "ti-linux-firmware"
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
index d3824b92..ec52d09c 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,12 +1,19 @@
 # NOTE: This .inc file with customizations only gets included for K3 platforms
-PV = "2.12+git"
+PV = "2.13+git"
-SRCREV_tfa = "39fe4a856d3576646642c2516b7a99de63eca74e"
-SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
-SRCBRANCH = "ti-master"
+SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
+SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
+SRCBRANCH = "master"
+LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
+SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
+SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
+SRCBRANCH:am62lxx = "ti-master"
 SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
-LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
 COMPATIBLE_MACHINE = "k3"
 TFA_BUILD_TARGET = "all"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
index 329c2af0..340c732e 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
@@ -6,4 +6,4 @@ PR = "r0"
 BRANCH = "ti-u-boot-2025.01"
-SRCREV = "c99a1f082ba4970678c9cb5100d13a986e77817c"
+SRCREV = "d2a72467939e169210bcd8e57de4b3e6ce2ef149"
diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
index 8691e523..1549e50f 100644
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -10,7 +10,7 @@ PV = "0.3+git"
 COMPATIBLE_MACHINE = "k3"
 BRANCH ?= "master"
-SRCREV = "ea9938bf9cafd9c0cb05ef060a713ab4ac72270f"
+SRCREV = "e6abc1b87f1d5bc4c2ab5f1ebfbf5a70e437dcb4"
 SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
index f7cb439f..7ab98d30 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
 BRANCH ?= "ti-linux-6.12.y"
-SRCREV ?= "34d0b070130a8cd2cddd9260389ad974e8cb8468"
+SRCREV ?= "e3e551586dfad357550da433969d6d9f458e06ce"
-PV = "6.12.33+git"
+PV = "6.12.35+git"
 # Special configuration for remoteproc/rpmsg IPC modules
 module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
index 2c8977dd..86c92863 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.4.0+git"
+PV = "4.6.0+git"
-SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
+SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
index 8c21bc75..6c120be2 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
@@ -1,2 +1,2 @@
-PV = "4.4.0+git"
+PV = "4.6.0+git"
-SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
+SRCREV = "5306d2c7c618bb4a91df17a2d5d79ae4701af4a3"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
index 89f7f818..d9705a0b 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
@@ -1,5 +1,5 @@
-PV = "4.5.0+git"
+PV = "4.6.0+git"
-SRCREV = "ef1ebdc23034a804a72da2207f1a825ce96a1464"
+SRCREV = "71785645fa6ce42db40dbf5a54e0eaedc4f61591"
 SRC_URI:remove = " \
    file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
index f815cb8d..35e780b3 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -1,7 +1,7 @@
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
-PV = "4.4.0+git"
+PV = "4.6.0+git"
-SRCREV = "695231ef8987866663a9ed5afd8f77d1bae3dc08"
+SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d"
 SRC_URI:remove = " \
    file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \

diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf index ca102961..652496c2 100644 --- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
@@ -10,11 +10,6 @@ UBOOT_CONFIG ??= "uart mmc"
10	UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"	10	UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
11	UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"	11	UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"
12		12
13	UBOOT_ENTRYPOINT = "0x82000000"
14	UBOOT_LOADADDRESS = "0x82000000"
15	UBOOT_RD_LOADADDRESS = "0x84000000"
16	UBOOT_RD_ENTRYPOINT = "0x84000000"
17
18	# FIT image for legacy secure devices	13	# FIT image for legacy secure devices
19	KERNEL_CLASSES += " kernel-fitimage-legacyhs"	14	KERNEL_CLASSES += " kernel-fitimage-legacyhs"
20	KERNEL_IMAGETYPES += " fitImage"	15	KERNEL_IMAGETYPES += " fitImage"


diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf index 632b4995..fde38d39 100644 --- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/am437x-evm.conf
6		6
7	UBOOT_MACHINE = "am43xx_hs_evm_config"	7	UBOOT_MACHINE = "am43xx_hs_evm_config"
8		8
9	UBOOT_ENTRYPOINT = "0x82000000"
10	UBOOT_LOADADDRESS = "0x82000000"
11	UBOOT_RD_LOADADDRESS = "0x84000000"
12	UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14	OPTEEMACHINE = "ti-am43xx"	9	OPTEEMACHINE = "ti-am43xx"
15	OPTEEFLAVOR = "am43xx"	10	OPTEEFLAVOR = "am43xx"
16		11


diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf index 4f36a847..fcdc5c0b 100644 --- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/am57xx-evm.conf
6		6
7	UBOOT_MACHINE = "am57xx_hs_evm_config"	7	UBOOT_MACHINE = "am57xx_hs_evm_config"
8		8
9	UBOOT_ENTRYPOINT = "0x82000000"
10	UBOOT_LOADADDRESS = "0x82000000"
11	UBOOT_RD_LOADADDRESS = "0x84000000"
12	UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14	OPTEEMACHINE = "ti-am57xx"	9	OPTEEMACHINE = "ti-am57xx"
15	OPTEEFLAVOR = "am57xx"	10	OPTEEFLAVOR = "am57xx"
16	OPTEEPAGER = "y"	11	OPTEEPAGER = "y"


diff --git a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf index 8e57a154..37ffef31 100644 --- a/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf +++ b/meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf
@@ -6,11 +6,6 @@ require conf/machine/dra7xx-evm.conf
6		6
7	UBOOT_MACHINE = "dra7xx_hs_evm_config"	7	UBOOT_MACHINE = "dra7xx_hs_evm_config"
8		8
9	UBOOT_ENTRYPOINT = "0x82000000"
10	UBOOT_LOADADDRESS = "0x82000000"
11	UBOOT_RD_LOADADDRESS = "0x84000000"
12	UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14	OPTEEMACHINE = "ti-dra7xx"	9	OPTEEMACHINE = "ti-dra7xx"
15	OPTEEFLAVOR = "dra7xx"	10	OPTEEFLAVOR = "dra7xx"
16	OPTEEPAGER = "y"	11	OPTEEPAGER = "y"


diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 9b85f867..7ec6b51e 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -13,18 +13,18 @@ KERNEL_IMAGETYPES = "Image fitImage"
13	KERNEL_CLASSES += "kernel-fitimage"	13	KERNEL_CLASSES += "kernel-fitimage"
14		14
15	UBOOT_ARCH = "arm"	15	UBOOT_ARCH = "arm"
16	UBOOT_ENTRYPOINT = "0x81000000"	16	UBOOT_DTB_LOADADDRESS = "0x88000000"
17	UBOOT_LOADADDRESS = "0x81000000"	17	UBOOT_DTBO_LOADADDRESS = "0x88080000"
18	UBOOT_RD_LOADADDRESS = "0x84000000"
19	UBOOT_RD_ENTRYPOINT = "0x84000000"
20	UBOOT_DTB_LOADADDRESS = "0x83000000"
21	UBOOT_DTBO_LOADADDRESS = "0x83080000"
22	UBOOT_DTBO_OFFSET = "0x00010000"	18	UBOOT_DTBO_OFFSET = "0x00010000"
23		19
24	SPL_BINARY = "tispl.bin"	20	SPL_BINARY = "tispl.bin"
25	SPL_BINARYNAME = "tispl.bin"	21	SPL_BINARYNAME = "tispl.bin"
26	UBOOT_SUFFIX = "img"	22	UBOOT_SUFFIX = "img"
27		23
		24	UBOOT_SIGN_ENABLE = "1"
		25	UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
		26	UBOOT_SIGN_KEYNAME ?= "custMpk"
		27	UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
28	FIT_HASH_ALG ?= "sha512"	28	FIT_HASH_ALG ?= "sha512"
29	FIT_SIGN_ALG ?= "rsa4096"	29	FIT_SIGN_ALG ?= "rsa4096"
30		30


diff --git a/meta-ti-bsp/conf/machine/include/ti-falcon.inc b/meta-ti-bsp/conf/machine/include/ti-falcon.inc index 0b938470..84a62b22 100644 --- a/meta-ti-bsp/conf/machine/include/ti-falcon.inc +++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
@@ -1,6 +1,4 @@
1	IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"	1	IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
2	KERNEL_CLASSES:remove = "kernel-fitimage"	2	KERNEL_CLASSES:remove = "kernel-fitimage"
3	KERNEL_CLASSES += "kernel-fitimage-legacyhs"	3	KERNEL_CLASSES += "kernel-fitimage-legacyhs"
4	UBOOT_DTB_LOADADDRESS = "0x88000000"
5	UBOOT_LOADADDRESS = "0x82000000"
6	FIT_KERNEL_COMP_ALG = "none"	4	FIT_KERNEL_COMP_ALG = "none"


diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc index 5d77e719..5125856f 100644 --- a/meta-ti-bsp/conf/machine/include/ti-soc.inc +++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -3,6 +3,12 @@
3	SOC_FAMILY = "ti-soc"	3	SOC_FAMILY = "ti-soc"
4	require conf/machine/include/soc-family.inc	4	require conf/machine/include/soc-family.inc
5		5
		6	# kernel, initrd load addresses for the fitImage in all TI platforms
		7	UBOOT_ENTRYPOINT = "0x82000000"
		8	UBOOT_LOADADDRESS = "0x82000000"
		9	UBOOT_RD_LOADADDRESS = "0x84000000"
		10	UBOOT_RD_ENTRYPOINT = "0x84000000"
		11
6	# TI platforms all use devicetrees with overlays	12	# TI platforms all use devicetrees with overlays
7	MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"	13	MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
8	KERNEL_DTB_OVERLAY_SUPPORT ?= "1"	14	KERNEL_DTB_OVERLAY_SUPPORT ?= "1"


diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index 61364c66..b22585ff 100644 --- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -15,11 +15,11 @@ CADENCE_MHDP_FW_VERSION = "2.1.0"
15	IMG_DEC_FW_VERSION = "1.0"	15	IMG_DEC_FW_VERSION = "1.0"
16	CNM_WAVE521_FW_VERSION = "1.0.8"	16	CNM_WAVE521_FW_VERSION = "1.0.8"
17	TI_DM_FW_VERSION = "11.00.09"	17	TI_DM_FW_VERSION = "11.00.09"
18	TI_SYSFW_VERSION = "11.01.00"	18	TI_SYSFW_VERSION = "11.01.02"
19	TI_HSM_DEMO_FW_VERSION = "11.00.09"	19	TI_HSM_DEMO_FW_VERSION = "11.00.09"
20	TAD5212_FW_VERSION = "1.0.0.0"	20	TAD5212_FW_VERSION = "1.0.0.0"
21		21
22	TI_LINUX_FW_SRCREV ?= "e594deb508a322d5681888d48fbb153953b06ca9"	22	TI_LINUX_FW_SRCREV ?= "33bec0e2ea9a25362c0c8243b2f1ed392dbc5b02"
23	SRCREV = "${TI_LINUX_FW_SRCREV}"	23	SRCREV = "${TI_LINUX_FW_SRCREV}"
24		24
25	BRANCH ?= "ti-linux-firmware"	25	BRANCH ?= "ti-linux-firmware"


diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc index d3824b92..ec52d09c 100644 --- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc +++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,12 +1,19 @@
1	# NOTE: This .inc file with customizations only gets included for K3 platforms	1	# NOTE: This .inc file with customizations only gets included for K3 platforms
2		2
3	PV = "2.12+git"	3	PV = "2.13+git"
4	SRCREV_tfa = "39fe4a856d3576646642c2516b7a99de63eca74e"	4
5	SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"	5	LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
6	SRCBRANCH = "ti-master"	6	SRCREV_tfa = "d90bb650fe4cb3784f62214ab5829f4051c38d0a"
		7	SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
		8	SRCBRANCH = "master"
		9
		10	LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
		11	SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
		12	SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
		13	SRCBRANCH:am62lxx = "ti-master"
		14
7	SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"	15	SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
8		16
9	LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
10	COMPATIBLE_MACHINE = "k3"	17	COMPATIBLE_MACHINE = "k3"
11		18
12	TFA_BUILD_TARGET = "all"	19	TFA_BUILD_TARGET = "all"


diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb index 329c2af0..340c732e 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
@@ -6,4 +6,4 @@ PR = "r0"
6		6
7	BRANCH = "ti-u-boot-2025.01"	7	BRANCH = "ti-u-boot-2025.01"
8		8
9	SRCREV = "c99a1f082ba4970678c9cb5100d13a986e77817c"	9	SRCREV = "d2a72467939e169210bcd8e57de4b3e6ce2ef149"


diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb index 8691e523..1549e50f 100644 --- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb +++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -10,7 +10,7 @@ PV = "0.3+git"
10	COMPATIBLE_MACHINE = "k3"	10	COMPATIBLE_MACHINE = "k3"
11		11
12	BRANCH ?= "master"	12	BRANCH ?= "master"
13	SRCREV = "ea9938bf9cafd9c0cb05ef060a713ab4ac72270f"	13	SRCREV = "e6abc1b87f1d5bc4c2ab5f1ebfbf5a70e437dcb4"
14		14
15	SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"	15	SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
16		16


diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb index f7cb439f..7ab98d30 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
23		23
24	BRANCH ?= "ti-linux-6.12.y"	24	BRANCH ?= "ti-linux-6.12.y"
25		25
26	SRCREV ?= "34d0b070130a8cd2cddd9260389ad974e8cb8468"	26	SRCREV ?= "e3e551586dfad357550da433969d6d9f458e06ce"
27	PV = "6.12.33+git"	27	PV = "6.12.35+git"
28		28
29	# Special configuration for remoteproc/rpmsg IPC modules	29	# Special configuration for remoteproc/rpmsg IPC modules
30	module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"	30	module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"


diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc index 2c8977dd..86c92863 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
@@ -1,2 +1,2 @@
1	PV = "4.4.0+git"	1	PV = "4.6.0+git"
2	SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"	2	SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"


diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc index 8c21bc75..6c120be2 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
@@ -1,2 +1,2 @@
1	PV = "4.4.0+git"	1	PV = "4.6.0+git"
2	SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"	2	SRCREV = "5306d2c7c618bb4a91df17a2d5d79ae4701af4a3"


diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc index 89f7f818..d9705a0b 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
@@ -1,5 +1,5 @@
1	PV = "4.5.0+git"	1	PV = "4.6.0+git"
2	SRCREV = "ef1ebdc23034a804a72da2207f1a825ce96a1464"	2	SRCREV = "71785645fa6ce42db40dbf5a54e0eaedc4f61591"
3		3
4	SRC_URI:remove = " \	4	SRC_URI:remove = " \
5	file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \	5	file://0001-checkconf.mk-do-not-use-full-path-to-generate-guard-.patch \


diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc index f815cb8d..35e780b3 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc +++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -1,7 +1,7 @@
1	LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"	1	LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
2		2
3	PV = "4.4.0+git"	3	PV = "4.6.0+git"
4	SRCREV = "695231ef8987866663a9ed5afd8f77d1bae3dc08"	4	SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d"
5		5
6	SRC_URI:remove = " \	6	SRC_URI:remove = " \
7	file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \	7	file://0001-xtest-stats-remove-unneeded-stat.h-include.patch \