summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-ti-bsp/conf/machine/am335x-hs-evm.conf5
-rw-r--r--meta-ti-bsp/conf/machine/am437x-hs-evm.conf5
-rw-r--r--meta-ti-bsp/conf/machine/am57xx-hs-evm.conf5
-rw-r--r--meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf5
-rw-r--r--meta-ti-bsp/conf/machine/include/k3.inc12
-rw-r--r--meta-ti-bsp/conf/machine/include/ti-falcon.inc2
-rw-r--r--meta-ti-bsp/conf/machine/include/ti-soc.inc6
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc4
-rw-r--r--meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc15
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb2
-rw-r--r--meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb4
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc4
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc4
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc4
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc4
16 files changed, 37 insertions, 46 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"
10UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config" 10UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
11UBOOT_CONFIG[mmc] = "am335x_hs_evm_config" 11UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"
12 12
13UBOOT_ENTRYPOINT = "0x82000000"
14UBOOT_LOADADDRESS = "0x82000000"
15UBOOT_RD_LOADADDRESS = "0x84000000"
16UBOOT_RD_ENTRYPOINT = "0x84000000"
17
18# FIT image for legacy secure devices 13# FIT image for legacy secure devices
19KERNEL_CLASSES += " kernel-fitimage-legacyhs" 14KERNEL_CLASSES += " kernel-fitimage-legacyhs"
20KERNEL_IMAGETYPES += " fitImage" 15KERNEL_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
7UBOOT_MACHINE = "am43xx_hs_evm_config" 7UBOOT_MACHINE = "am43xx_hs_evm_config"
8 8
9UBOOT_ENTRYPOINT = "0x82000000"
10UBOOT_LOADADDRESS = "0x82000000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14OPTEEMACHINE = "ti-am43xx" 9OPTEEMACHINE = "ti-am43xx"
15OPTEEFLAVOR = "am43xx" 10OPTEEFLAVOR = "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
7UBOOT_MACHINE = "am57xx_hs_evm_config" 7UBOOT_MACHINE = "am57xx_hs_evm_config"
8 8
9UBOOT_ENTRYPOINT = "0x82000000"
10UBOOT_LOADADDRESS = "0x82000000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14OPTEEMACHINE = "ti-am57xx" 9OPTEEMACHINE = "ti-am57xx"
15OPTEEFLAVOR = "am57xx" 10OPTEEFLAVOR = "am57xx"
16OPTEEPAGER = "y" 11OPTEEPAGER = "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
7UBOOT_MACHINE = "dra7xx_hs_evm_config" 7UBOOT_MACHINE = "dra7xx_hs_evm_config"
8 8
9UBOOT_ENTRYPOINT = "0x82000000"
10UBOOT_LOADADDRESS = "0x82000000"
11UBOOT_RD_LOADADDRESS = "0x84000000"
12UBOOT_RD_ENTRYPOINT = "0x84000000"
13
14OPTEEMACHINE = "ti-dra7xx" 9OPTEEMACHINE = "ti-dra7xx"
15OPTEEFLAVOR = "dra7xx" 10OPTEEFLAVOR = "dra7xx"
16OPTEEPAGER = "y" 11OPTEEPAGER = "y"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index ec9a8944..111022f6 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"
13KERNEL_CLASSES += "kernel-fitimage-deprecated" 13KERNEL_CLASSES += "kernel-fitimage-deprecated"
14 14
15UBOOT_ARCH = "arm" 15UBOOT_ARCH = "arm"
16UBOOT_ENTRYPOINT = "0x81000000" 16UBOOT_DTB_LOADADDRESS = "0x88000000"
17UBOOT_LOADADDRESS = "0x81000000" 17UBOOT_DTBO_LOADADDRESS = "0x88080000"
18UBOOT_RD_LOADADDRESS = "0x84000000"
19UBOOT_RD_ENTRYPOINT = "0x84000000"
20UBOOT_DTB_LOADADDRESS = "0x83000000"
21UBOOT_DTBO_LOADADDRESS = "0x83080000"
22UBOOT_DTBO_OFFSET = "0x00010000" 18UBOOT_DTBO_OFFSET = "0x00010000"
23 19
24SPL_BINARY = "tispl.bin" 20SPL_BINARY = "tispl.bin"
25SPL_BINARYNAME = "tispl.bin" 21SPL_BINARYNAME = "tispl.bin"
26UBOOT_SUFFIX = "img" 22UBOOT_SUFFIX = "img"
27 23
24UBOOT_SIGN_ENABLE = "1"
25UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
26UBOOT_SIGN_KEYNAME ?= "custMpk"
27UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
28FIT_HASH_ALG ?= "sha512" 28FIT_HASH_ALG ?= "sha512"
29FIT_SIGN_ALG ?= "rsa4096" 29FIT_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 252fb28a..e436932e 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 @@
1IMAGE_INSTALL:append = " u-boot-ti-staging-falcon" 1IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
2KERNEL_CLASSES:remove = "kernel-fitimage-deprecated" 2KERNEL_CLASSES:remove = "kernel-fitimage-deprecated"
3KERNEL_CLASSES += "kernel-fitimage-legacyhs" 3KERNEL_CLASSES += "kernel-fitimage-legacyhs"
4UBOOT_DTB_LOADADDRESS = "0x88000000"
5UBOOT_LOADADDRESS = "0x82000000"
6FIT_KERNEL_COMP_ALG = "none" 4FIT_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 @@
3SOC_FAMILY = "ti-soc" 3SOC_FAMILY = "ti-soc"
4require conf/machine/include/soc-family.inc 4require conf/machine/include/soc-family.inc
5 5
6# kernel, initrd load addresses for the fitImage in all TI platforms
7UBOOT_ENTRYPOINT = "0x82000000"
8UBOOT_LOADADDRESS = "0x82000000"
9UBOOT_RD_LOADADDRESS = "0x84000000"
10UBOOT_RD_ENTRYPOINT = "0x84000000"
11
6# TI platforms all use devicetrees with overlays 12# TI platforms all use devicetrees with overlays
7MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" 13MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
8KERNEL_DTB_OVERLAY_SUPPORT ?= "1" 14KERNEL_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 58c4431e..e83e27d6 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"
15IMG_DEC_FW_VERSION = "1.0" 15IMG_DEC_FW_VERSION = "1.0"
16CNM_WAVE521_FW_VERSION = "1.0.8" 16CNM_WAVE521_FW_VERSION = "1.0.8"
17TI_DM_FW_VERSION = "11.00.09" 17TI_DM_FW_VERSION = "11.00.09"
18TI_SYSFW_VERSION = "11.01.00" 18TI_SYSFW_VERSION = "11.01.02"
19TI_HSM_DEMO_FW_VERSION = "11.00.09" 19TI_HSM_DEMO_FW_VERSION = "11.00.09"
20TAD5212_FW_VERSION = "1.0.0.0" 20TAD5212_FW_VERSION = "1.0.0.0"
21 21
22TI_LINUX_FW_SRCREV ?= "e594deb508a322d5681888d48fbb153953b06ca9" 22TI_LINUX_FW_SRCREV ?= "33bec0e2ea9a25362c0c8243b2f1ed392dbc5b02"
23SRCREV = "${TI_LINUX_FW_SRCREV}" 23SRCREV = "${TI_LINUX_FW_SRCREV}"
24 24
25BRANCH ?= "ti-linux-firmware" 25BRANCH ?= "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 c17ac9de..6dc33e20 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
3PV = "2.12+git" 3PV = "2.13+git"
4
5LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e"
4SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050" 6SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
5SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https" 7SRC_URI_TRUSTED_FIRMWARE_A = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https"
6SRCBRANCH = "ti-master" 8SRCBRANCH = "master"
9
10LIC_FILES_CHKSUM:am62lxx = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
11SRCREV_tfa:am62lxx = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
12SRC_URI_TRUSTED_FIRMWARE_A:am62lxx = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
13SRCBRANCH:am62lxx = "ti-master"
14
7SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}" 15SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
8 16
9LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
10COMPATIBLE_MACHINE = "k3" 17COMPATIBLE_MACHINE = "k3"
11 18
12TFA_BUILD_TARGET = "all" 19TFA_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
7BRANCH = "ti-u-boot-2025.01" 7BRANCH = "ti-u-boot-2025.01"
8 8
9SRCREV = "c99a1f082ba4970678c9cb5100d13a986e77817c" 9SRCREV = "d2a72467939e169210bcd8e57de4b3e6ce2ef149"
diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
index ffc48d84..3be1f46b 100644
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -10,6 +10,6 @@ PV = "0.3+git"
10COMPATIBLE_MACHINE = "k3" 10COMPATIBLE_MACHINE = "k3"
11 11
12BRANCH ?= "master" 12BRANCH ?= "master"
13SRCREV = "ea9938bf9cafd9c0cb05ef060a713ab4ac72270f" 13SRCREV = "e6abc1b87f1d5bc4c2ab5f1ebfbf5a70e437dcb4"
14 14
15SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" 15SRC_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 15ff3311..127e1397 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 = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
23 23
24BRANCH ?= "ti-linux-6.12.y" 24BRANCH ?= "ti-linux-6.12.y"
25 25
26SRCREV ?= "34d0b070130a8cd2cddd9260389ad974e8cb8468" 26SRCREV ?= "e3e551586dfad357550da433969d6d9f458e06ce"
27PV = "6.12.33+git" 27PV = "6.12.35+git"
28 28
29KERNEL_REPRODUCIBILITY_PATCHES = " \ 29KERNEL_REPRODUCIBILITY_PATCHES = " \
30 file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \ 30 file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
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 a628e446..dd00cde1 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,5 +1,5 @@
1PV = "4.4.0+git" 1PV = "4.6.0+git"
2SRCREV = "d221676a58b305bddbf97db00395205b3038de8e" 2SRCREV = "02e7f9213b0d7db9c35ebf1e41e733fc9c5a3f75"
3 3
4SRC_URI:remove = " \ 4SRC_URI:remove = " \
5 file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \ 5 file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \
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 @@
1PV = "4.4.0+git" 1PV = "4.6.0+git"
2SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035" 2SRCREV = "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 6b70c029..a9a1d1e8 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 @@
1PV = "4.5.0+git" 1PV = "4.6.0+git"
2SRCREV = "ef1ebdc23034a804a72da2207f1a825ce96a1464" 2SRCREV = "71785645fa6ce42db40dbf5a54e0eaedc4f61591"
3 3
4SRC_URI:remove = " \ 4SRC_URI:remove = " \
5 file://0001-mk-compile.mk-remove-absolute-build-time-paths.patch \ 5 file://0001-mk-compile.mk-remove-absolute-build-time-paths.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 e4b3a384..dec59d88 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,5 +1,5 @@
1FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:" 1FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
2 2
3PV = "4.4.0+git" 3PV = "4.6.0+git"
4SRCREV = "695231ef8987866663a9ed5afd8f77d1bae3dc08" 4SRCREV = "a9e9495f4d57b97022008ad11198195e7e044c5d"
5SRC_URI += "file://0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch" 5SRC_URI += "file://0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-04 11:47:54 +0000