linux-ti-staging-rt: Bump to 08.04.00.005 release

Updated the linux rt version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>
linux-ti-staging: Bump to 08.04.00.005 release
2026-01-12 01:20:20 +00:00 · 2022-07-26 07:38:29 -05:00 · 2022-07-26 07:38:28 -05:00 · 2022-07-26 07:38:28 -05:00 · 2022-07-25 14:58:22 -05:00 · 2022-07-25 14:57:41 -05:00
39 changed files with 181 additions and 116 deletions
--- a/conf/machine/am57xx-evm.conf
+++ b/conf/machine/am57xx-evm.conf
@@ -13,9 +13,9 @@ KERNEL_DEVICETREE = " \
    am57xx-beagle-x15-revb1.dtb \
    am57xx-beagle-x15-revc.dtb \
    am5729-beagleboneai.dtb \
-    am57xx-evm.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm.dtb', d)} \
    ti/am57xx-evm-common.dtbo \
-    am57xx-evm-reva3.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm-reva3.dtb', d)} \
    ti/am57xx-evm-reva3.dtbo \
    am571x-idk.dtb \
    ti/am571x-idk-touchscreen.dtbo \
@@ -25,7 +25,7 @@ KERNEL_DEVICETREE = " \
    ti/am572x-idk-touchscreen.dtbo \
    ti/lcd-osd101t2587.dtbo \
    ti/lcd-osd101t2045.dtbo \
-    ti/ov10635.dtbo \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'ti/ov10635.dtbo', d)} \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
--- a/conf/machine/am62xx-evm.conf
+++ b/conf/machine/am62xx-evm.conf
@@ -8,6 +8,8 @@ MACHINE_FEATURES += "gpu"

 KERNEL_DEVICETREE = " \
    ti/k3-am625-sk.dtb \
+    ti/k3-am625-skeleton.dtb \
+    ti/k3-am625-sk-lpmdemo.dtb \
    ti/k3-am625-sk-csi2-ov5640.dtbo \
 "

--- a/conf/machine/am64xx-hs-evm.conf
+++ b/conf/machine/am64xx-hs-evm.conf
@@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"

 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"

 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/conf/machine/am65xx-hs-evm.conf
@@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"

 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"

 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -12,7 +12,7 @@ KERNEL_DEVICETREE = " \
    dra7-evm.dtb \
    ti/dra7x-evm-osd-lcd-common.dtbo \
    dra71-evm.dtb \
-    dra71-evm-nand.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'dra71-evm-nand.dtb', d)} \
    ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \
    dra72-evm.dtb \
    dra72-evm-revc.dtb \
--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"

 TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"
 OPTEEOUTPUTMACHINE = "k3"
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -10,6 +10,7 @@ KERNEL_DEVICETREE = " \
    ti/k3-am642-evm.dtb \
    ti/k3-am642-sk.dtb \
    ti/k3-am642-evm-icssg1-dualemac.dtbo \
+    ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
    ti/k3-am642-evm-nand.dtbo \
 "

@@ -20,7 +21,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"

 TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"
 OPTEEOUTPUTMACHINE = "k3"

 # Set the list of device targets for ti-pdk class recipes
--- a/conf/machine/include/k3.inc
+++ b/conf/machine/include/k3.inc
@@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"

 SPL_BINARY = "tispl.bin"
+SPL_BINARYNAME = "tispl.bin"
 UBOOT_SUFFIX = "img"

 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
@@ -40,8 +41,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"

 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"

-IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
+IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"

 IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"

--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -27,9 +27,11 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 KERNEL_IMAGETYPE = "zImage"

 KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
+    am437x-gp-evm.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \
    am437x-sk-evm.dtb am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \
+    am43x-epos-evm.dtb \
+    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \
 "

 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
--- a/conf/machine/j7-hs-evm-k3r5.conf
+++ b/conf/machine/j7-hs-evm-k3r5.conf
@@ -7,6 +7,7 @@ require conf/machine/include/k3r5.inc
 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
+SYSFW_SYMLINK = ""

 UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"

--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-hs-evm.conf
@@ -15,9 +15,8 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"

 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"

 BBMULTICONFIG += "k3r5-sr1-1"

--- a/conf/machine/j7200-hs-evm-k3r5.conf
+++ b/conf/machine/j7200-hs-evm-k3r5.conf
@@ -4,7 +4,7 @@

 require conf/machine/include/k3r5.inc

-SYSFW_SOC = "j7200"
+SYSFW_SOC = "j7200_sr2"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"

--- a/conf/machine/j7200-hs-evm.conf
+++ b/conf/machine/j7200-hs-evm.conf
@@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"

 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"

 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/j721s2-evm.conf
+++ b/conf/machine/j721s2-evm.conf
@@ -13,6 +13,7 @@ OPTEE_K3_USART = "0x8"

 KERNEL_DEVICETREE = " \
    ti/k3-j721s2-common-proc-board.dtb \
+    ti/k3-j721s2-gesi-exp-board.dtbo \
 "

 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
--- a/conf/machine/j721s2-hs-evm-k3r5.conf
+++ b/conf/machine/j721s2-hs-evm-k3r5.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: J721S2 HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/conf/machine/j721s2-hs-evm.conf
+++ b/conf/machine/j721s2-hs-evm.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: J721S2 HS EVM
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
+
+require conf/machine/j721s2-evm.conf
+
+UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
+
+UBOOT_ENTRYPOINT =       "0x80080000"
+UBOOT_LOADADDRESS =      "0x80080000"
+UBOOT_RD_LOADADDRESS =   "0x84000000"
+UBOOT_RD_ENTRYPOINT =    "0x84000000"
+UBOOT_DTB_LOADADDRESS =  "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83080000"
+UBOOT_DTBO_OFFSET =      "0x00010000"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
--- a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -13,7 +13,7 @@ PR = "${INC_PR}.1"

 CLEANBROKEN = "1"

-COMPATIBLE_MACHINE = "j721s2-evm"
+COMPATIBLE_MACHINE = "j721s2-evm|j721s2-hs-evm"

 PACKAGE_ARCH = "${MACHINE_ARCH}"

@@ -22,6 +22,7 @@ TARGET_WAVE521C = "wave521c_codec_fw.bin"

 SOURCE_WAVE521C = "wave521c_codec_fw.bin"
 SOURCE_WAVE521C_j721s2-evm = "wave521c_j721s2_codec_fw.bin"
+SOURCE_WAVE521C_j721s2-hs-evm = "wave521c_j721s2_codec_fw.bin"

 ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${base_libdir}/firmware/${TARGET_WAVE521C}"
 ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${base_libdir}/firmware/cnm/${TARGET_WAVE521C}"
--- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
+++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
@@ -11,7 +11,7 @@ MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"

 DEPENDS = "virtual/kernel"

@@ -31,10 +31,12 @@ SRCREV = "6d3d62a15ceb85b719c35f34c6c9e35f556b406b"
 TARGET_PRODUCT_j7-evm = "j721e_linux"
 TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
 TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
+TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux"
 TARGET_PRODUCT_am62xx = "am62_linux"
 TARGET_BVNC_j7-evm = "22.104.208.318"
 TARGET_BVNC_j7-hs-evm = "22.104.208.318"
 TARGET_BVNC_j721s2-evm = "36.53.104.796"
+TARGET_BVNC_j721s2-hs-evm = "36.53.104.796"
 TARGET_BVNC_am62xx = "33.15.11.3"
 PVR_BUILD = "release"
 PVR_WS = "wayland"
--- a/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -6,6 +6,8 @@ DEPENDS = "libdrm ffmpeg"

 inherit autotools pkgconfig

+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm"
+
 PR = "r1"
 SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2"

--- a/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
+++ b/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -6,6 +6,8 @@ DEPENDS = "libdrm"

 inherit autotools pkgconfig

+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm"
+
 PR = "r0"
 SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a"

--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -20,12 +20,12 @@ IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.00"
 TIFS_LPM_STUB_FW_VERSION = "08.03.02"

-TI_LINUX_FW_SRCREV ?= "5aa15e59927a5c4acc4dd61d213ab6cef7c0209f"
+TI_LINUX_FW_SRCREV ?= "2d9a1002663a20673d942826c558ba4b472ffe9a"
 SRCREV = "${TI_LINUX_FW_SRCREV}"

 BRANCH ?= "ti-linux-firmware"

-K3_IMAGE_GEN_SRCREV ?= "62872c7e285fa9b9af76a258a24d603f851769c3"
+K3_IMAGE_GEN_SRCREV ?= "85a70059fc24242ea03653a5014b98100e4da2d6"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"

--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -4,6 +4,7 @@ DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
 DEPENDS_append_j7200-evm-k3r5 = " virtual/bootloader"
 DEPENDS_append_j7200-hs-evm-k3r5 = " virtual/bootloader"
 DEPENDS_append_j721s2-evm-k3r5 = " virtual/bootloader"
+DEPENDS_append_j721s2-hs-evm-k3r5 = " virtual/bootloader"
 DEPENDS_append_am64xx-evm-k3r5 = " virtual/bootloader"
 DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader"
 DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader"
@@ -30,6 +31,7 @@ SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "ti-fs-firmware"
 SYSFW_PREFIX_j7200-evm-k3r5 = "ti-fs-firmware"
 SYSFW_PREFIX_j7200-hs-evm-k3r5 = "ti-fs-firmware"
 SYSFW_PREFIX_j721s2-evm-k3r5 = "ti-fs-firmware"
+SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "ti-fs-firmware"
 SYSFW_PREFIX_am62xx-evm-k3r5 = "ti-fs-firmware"

 SYSFW_SUFFIX ?= "unknown"
@@ -63,6 +65,7 @@ EXTRA_OEMAKE_append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}
 EXTRA_OEMAKE_append_j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE_append_j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE_append_j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE_append_j721s2-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE_append_am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE_append_am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE_append_am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
@@ -143,6 +146,21 @@ do_deploy_j721s2-evm-k3r5() {
 	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
 }

+do_install_j721s2-hs-evm-k3r5() {
+	install -d ${D}/boot
+	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK}
+	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+}
+
+do_deploy_j721s2-hs-evm-k3r5() {
+	install -d ${DEPLOYDIR}
+	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
+	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
+	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
+}
+
 do_install_am64xx-evm-k3r5() {
 	install -d ${D}/boot
 	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -1,8 +1,6 @@
 PV_k3 = "2.6"
 LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-BRANCH_k3 = "ti-atf"
-SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa_k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce"
+SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934"
 COMPATIBLE_MACHINE_k3 = "k3"
 TFA_BUILD_TARGET_k3 = "all"
 TFA_INSTALL_TARGET_k3 = "bl31"
@@ -42,3 +40,11 @@ do_compile_append_j7200-hs-evm() {
                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
        )
 }
+
+do_compile_append_j721s2-hs-evm() {
+	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+	( cd ${B}/${BUILD_DIR}/release/; \
+		mv bl31.bin bl31.bin.unsigned; \
+		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+	)
+}
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc

 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"

-PR = "r26"
+PR = "r32"

 BRANCH = "ti-u-boot-2021.01"

-SRCREV = "2de57d278b74747234313b51f8daac9928a5df6c"
+SRCREV = "a169f4261024397dd3ddb944decc1601a623df2a"
--- a/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,6 +1,6 @@
 # UBOOT_LOCALVERSION can be set to add a tag to the end of the
 # U-boot version string.  such as the commit id
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
+UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"

 UBOOT_SUFFIX ?= "img"
 SPL_BINARY ?= "MLO"
@@ -60,6 +60,7 @@ SPL_UART_BINARY_lego-ev3 = ""
 SPL_UART_BINARY_j7200-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY_j7200-hs-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY_j721s2-evm-k3r5 = "u-boot-spl.bin"
+SPL_UART_BINARY_j721s2-hs-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY_am64xx-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY_am64xx-hs-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY_am62xx-evm-k3r5 = "u-boot-spl.bin"
@@ -403,6 +404,11 @@ do_deploy_append_j721s2-evm-k3r5 () {
 	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
 }

+do_deploy_append_j721s2-hs-evm-k3r5 () {
+	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
+	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
+}
+
 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
--- a/recipes-bsp/x-load/x-load_1.46-psp.bb
+++ b/recipes-bsp/x-load/x-load_1.46-psp.bb
@@ -12,7 +12,7 @@ PE = "1"

 # TI PSP v1.46_OMAPPSP_03.00.01.06 (Tag is one commit different)
 SRCREV_pn-${PN} = "fc6d5be15c703d21aef0ae0b8c02177721f0445f"
-SRC_URI = "git://arago-project.org/git/projects/x-load-omap3.git;protocol=git"
+SRC_URI = "git://git.ti.com/git/arago-project-org/x-load-omap3.git;protocol=https"

 S = "${WORKDIR}/git"

--- a/recipes-devtools/k3conf/k3conf_git.bb
+++ b/recipes-devtools/k3conf/k3conf_git.bb
@@ -8,7 +8,7 @@ PV = "0.2+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"

 BRANCH ?= "master"
-SRCREV = "966a5695b73bc53039ca60d196b77de0640088d4"
+SRCREV = "48cb8e8d7dc962229a9f318cd512b4ddeec5cdc5"

 SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}"

--- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
+++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
@@ -8,7 +8,7 @@ inherit features_check
 REQUIRED_MACHINE_FEATURES = "gpu"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|am62xx"
+COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|am62xx"

 PR = "r2"

@@ -20,6 +20,7 @@ SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed"
 TARGET_PRODUCT_j7-evm = "j721e_linux"
 TARGET_PRODUCT_j7-hs-evm = "j721e_linux"
 TARGET_PRODUCT_j721s2-evm = "j721s2_linux"
+TARGET_PRODUCT_j721s2-hs-evm = "j721s2_linux"
 TARGET_PRODUCT_am62xx = "am62_linux"
 PVR_BUILD ?= "release"
 PVR_WS = "wayland"
--- a/recipes-kernel/linux/kernel-rdepends.inc
+++ b/recipes-kernel/linux/kernel-rdepends.inc
@@ -45,6 +45,7 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " vxd-dec-fw"

 # Add run-time dependency for Chips&Media Wave521 firmware to the rootfs
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-evm = " cnm-wave-fw"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cnm-wave-fw"

 # Add run-time dependency for TIFS Low Power Module stub
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub"
--- a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.10:"

 BRANCH = "ti-rt-linux-5.10.y"

-SRCREV = "f57afba2afc20fecd853518af1c24221fa3b5c76"
-PV = "5.10.109+git${SRCPV}"
+SRCREV = "adb96c641cb03198db729962eb348ca1a16978e2"
+PV = "5.10.120+git${SRCPV}"
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,8 +25,8 @@ S = "${WORKDIR}/git"

 BRANCH = "ti-linux-5.10.y"

-SRCREV = "478daea6c94e2c885fa2cf049bc11fb285c5323b"
-PV = "5.10.109+git${SRCPV}"
+SRCREV = "95b90aa828165df6c45d6bb0e1cce905e83a66a7"
+PV = "5.10.120+git${SRCPV}"

 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR_append = "b"
@@ -45,9 +45,3 @@ module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg
 module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
 KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
 KERNEL_MODULE_AUTOLOAD_append_j7 = " rpmsg_kdrv_switch"
-
-# Disable SA2UL for AM64x HS and J7200 HS
-module_conf_sa2ul_am64xx-hs-evm = "blacklist sa2ul"
-KERNEL_MODULE_PROBECONF_append_am64xx-hs-evm = " sa2ul"
-module_conf_sa2ul_j7200-hs-evm = "blacklist sa2ul"
-KERNEL_MODULE_PROBECONF_append_j7200-hs-evm = " sa2ul"
--- a/recipes-kernel/linux/setup-defconfig.inc
+++ b/recipes-kernel/linux/setup-defconfig.inc
@@ -1,6 +1,6 @@
 # KERNEL_LOCALVERSION can be set to add a tag to the end of the
 # kernel version string.  such as the commit id
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
+KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"

 # Check the defconfig file and see if it points to an in kernel
 # defconfig that should be used, or if it is a complete config file
--- a/recipes-security/optee/optee-client_%.bbappend
+++ b/recipes-security/optee/optee-client_%.bbappend
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
--- a/recipes-security/optee/optee-examples_%.bbappend
+++ b/recipes-security/optee/optee-examples_%.bbappend
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
--- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
+++ b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Tue, 26 May 2020 14:38:02 -0500
-Subject: [PATCH] allow setting sysroot for libgcc lookup
-
-Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching
-for the compiler libraries as there's no easy way to reliably pass --sysroot
-otherwise.
-
-Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
---
- mk/gcc.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mk/gcc.mk b/mk/gcc.mk
-index adc77a24..81bfa78a 100644
--- a/mk/gcc.mk
-+++ b/mk/gcc.mk
-@@ -13,11 +13,11 @@ nostdinc$(sm)	:= -nostdinc -isystem $(shell $(CC$(sm)) \
- 			-print-file-name=include 2> /dev/null)
- 
- # Get location of libgcc from gcc
-libgcc$(sm)  	:= $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
-+libgcc$(sm)  	:= $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
- 			-print-libgcc-file-name 2> /dev/null)
-libstdc++$(sm)	:= $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-+libstdc++$(sm)	:= $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
- 			-print-file-name=libstdc++.a 2> /dev/null)
-libgcc_eh$(sm)	:= $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-+libgcc_eh$(sm)	:= $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
- 			-print-file-name=libgcc_eh.a 2> /dev/null)
- 
- # Define these to something to discover accidental use
--- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
+++ b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <brett.warren@arm.com>
-Date: Wed, 23 Sep 2020 09:27:34 +0100
-Subject: [PATCH] optee: enable clang support
-
-When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
-to provide a sysroot wasn't included, which results in not locating
-compiler-rt. This is mitigated by including the variable as ammended.
-
-Upstream-Status: Pending
-ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
-Signed-off-by: Brett Warren <brett.warren@arm.com>
---
- mk/clang.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/clang.mk b/mk/clang.mk
-index 0f48c836..47465523 100644
--- a/mk/clang.mk
-+++ b/mk/clang.mk
-@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
- 
- # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
- # libgcc for clang
-libgcc$(sm)	:= $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
-+libgcc$(sm)	:= $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
- 			-rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
- 
- # Core ASLR relies on the executable being ready to run from its preferred load
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -1,17 +1,15 @@
-FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:"
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca"
+SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https"

-PV_ti-soc = "3.12.0+git${SRCPV}"
-
-SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d"
-
-SRC_URI_ti-soc = " \
-    git://github.com/OP-TEE/optee_os.git \
-    file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
-    file://0007-allow-setting-sysroot-for-clang.patch \
-"
+DEPENDS_append_ti-soc = " python3-cryptography-native"

 EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"

+EXTRA_OEMAKE_append_am62xx-evm = " CFG_WITH_SOFTWARE_PRNG=y"
+EXTRA_OEMAKE_append_j721s2-evm = " CFG_WITH_SOFTWARE_PRNG=y"
+EXTRA_OEMAKE_append_j721s2-hs-evm = " CFG_WITH_SOFTWARE_PRNG=y"
+
 do_compile_prepend_ti-soc() {
    export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
 }
@@ -75,6 +73,10 @@ do_compile_append_j7200-hs-evm() {
    optee_sign_k3hs
 }

+do_compile_append_j721s2-hs-evm() {
+    optee_sign_k3hs
+}
+
 do_install_append_ti-soc() {
    install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true
    install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true
--- a/recipes-security/optee/optee-test_%.bbappend
+++ b/recipes-security/optee/optee-test_%.bbappend
@@ -0,0 +1,5 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25"
+SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https"
+
+DEPENDS_append_ti-soc = " python3-cryptography-native"
--- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -17,6 +17,7 @@ PLAT_SFX_j7 = "j721e"
 PLAT_SFX_j7200-evm = "j7200"
 PLAT_SFX_j7200-hs-evm = "j7200"
 PLAT_SFX_j721s2-evm = "j721s2"
+PLAT_SFX_j721s2-hs-evm = "j721s2"
 PLAT_SFX_am65xx = "am65xx"
 PLAT_SFX_am64xx = "am64xx"
 PLAT_SFX_am62xx = "am62xx"
@@ -67,6 +68,15 @@ do_install_prepend_j7200-hs-evm() {
        )
 }

+# J7 HS support
+do_install_prepend_j721s2-hs-evm() {
+        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+        ( cd ${RTOS_DM_FW_DIR}; \
+                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
+        )
+}
+
 # Update the am64xx ipc binaries to be consistent with other platforms
 do_install_prepend_am64xx() {
        ( cd ${RTOS_IPC_FW_DIR}; \
@@ -147,6 +157,22 @@ do_install_j721s2-evm() {
    # install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR}
 }

+do_install_j721s2-hs-evm() {
+    install -d ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
+    # DM Firmware
+    install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
+    # ETH firmware
+    # install -d ${LEGACY_ETH_FW_DIR}
+    # install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR}
+}
+
 do_install_am65xx() {
    install -d ${LEGACY_IPC_FW_DIR}
    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
@@ -234,6 +260,17 @@ ALTERNATIVE_${PN}_j721s2-evm = "\
                    j721s2-c71_1-fw \
                    "

+ALTERNATIVE_${PN}_j721s2-hs-evm = "\
+                    j721s2-mcu-r5f0_0-fw \
+                    j721s2-mcu-r5f0_1-fw \
+                    j721s2-main-r5f0_0-fw \
+                    j721s2-main-r5f0_1-fw \
+                    j721s2-main-r5f1_0-fw \
+                    j721s2-main-r5f1_1-fw \
+                    j721s2-c71_0-fw \
+                    j721s2-c71_1-fw \
+                    "
+
 # Set up link names for the firmwares

 TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw"
@@ -277,6 +314,15 @@ TARGET_MAIN_R5FSS1_1_j721s2-evm = "j721s2-main-r5f1_1-fw"
 TARGET_C7X_0_j721s2-evm = "j721s2-c71_0-fw"
 TARGET_C7X_1_j721s2-evm = "j721s2-c71_1-fw"

+TARGET_MCU_R5FSS0_0_j721s2-hs-evm = "j721s2-mcu-r5f0_0-fw"
+TARGET_MCU_R5FSS0_1_j721s2-hs-evm = "j721s2-mcu-r5f0_1-fw"
+TARGET_MAIN_R5FSS0_0_j721s2-hs-evm = "j721s2-main-r5f0_0-fw"
+TARGET_MAIN_R5FSS0_1_j721s2-hs-evm = "j721s2-main-r5f0_1-fw"
+TARGET_MAIN_R5FSS1_0_j721s2-hs-evm = "j721s2-main-r5f1_0-fw"
+TARGET_MAIN_R5FSS1_1_j721s2-hs-evm = "j721s2-main-r5f1_1-fw"
+TARGET_C7X_0_j721s2-hs-evm = "j721s2-c71_0-fw"
+TARGET_C7X_1_j721s2-hs-evm = "j721s2-c71_1-fw"
+
 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
Author	SHA1	Message	Date
Ryan Eatmon	762f490818	linux-ti-staging-rt: Bump to 08.04.00.005 release Updated the linux rt version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-26 07:38:29 -05:00
Ryan Eatmon	658725115b	linux-ti-staging: Bump to 08.04.00.005 release Updated the linux version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-26 07:38:28 -05:00
Ryan Eatmon	4ff67e900c	u-boot-ti-staging: Bump to 08.04.00.005 release Updated the u-boot version for 08.04.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-26 07:38:28 -05:00
Ryan Eatmon	1e23cfaf6e	kernel u-boot: Fix formulation of LOCALVERSION devtool does not work with the current formulation of the LOCALVERSION variables. We need to use SRCPV to avoid AUTOREV on bleeding builds, but there will be no + in the string, so we cannot split on that. Just use SRCPV directly. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-25 14:58:22 -05:00
Jonathan Humphreys	a45a3d5786	j7200-hs-evm-k3r5: Move J7200 HS evm support to PG2.0 With J7200 PG1.0 being deprecated, use PG2.0 sysfw when building images for j7200-hs-evm. Also update k3-image-gen version to support this change. Signed-off-by: Jonathan Humphreys <j-humphreys@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-25 14:57:41 -05:00
Ryan Eatmon	b3ad2944a5	x-load: Remove reference to arago-project.org arago-project.org is being shut down in August. This commit changes the last recipes that point to that old site to point to git.ti.com, or just rmeove the reference entirely. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-20 15:31:11 -05:00
Bryan Brattlof	de917485fa	k3conf: update SRCREV to add j721S2 fixes update the SHA for k3conf to pickup the j721s2 fixes Signed-off-by: Bryan Brattlof <bb@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-20 15:00:43 -05:00
Denys Dmytriyenko	ca89c6ec0f	j7-hs-evm-k3r5: do not create generic sysfw.itb symlink Commit `bdceaa05ac` added SR1.1 support for J721e HS with the idea that the default sysfw.itb will point to SR1.1. For that to work, the config for SR1 has to explicitly disable creating such symlink. Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-20 14:58:34 -05:00
Ryan Eatmon	2bab786b59	ti-img-encode-decode: Lock test app to j7-evm The test app is not compatible with later versions of j7, so add COMPATIBLE_MACHINE to lock these recipes down to just j7-evm and j7-hs-evm. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-14 07:22:56 -05:00
Drew Fustini	00b859dbf7	conf: am43: avoid missing dtb files when ARAGO_BRAND=mainline For ARAGO_BRAND=mainline with the am43xx machines, avoid the inclusion of device tree files that do not exist upstream. Signed-off-by: Drew Fustini <dfustini@baylibre.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-12 11:42:17 -05:00
Drew Fustini	4b490a2e89	conf: dra7xx-evm: avoid missing dtb files when ARAGO_BRAND=mainline For ARAGO_BRAND=mainline with the dra7xx-evm MACHINE, avoid the inclusion of device tree files that do not exist upstream. Signed-off-by: Drew Fustini <dfustini@baylibre.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-12 11:42:17 -05:00
Drew Fustini	460c3f0fbd	conf: am57xx-evm: avoid missing dtb files when ARAGO_BRAND=mainline For ARAGO_BRAND=mainline with the am57xx-evm MACHINE, avoid the inclusion of device tree files that do not exist upstream. Signed-off-by: Drew Fustini <dfustini@baylibre.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-12 11:42:17 -05:00
Ryan Eatmon	c83998b42d	linux-ti-staging-rt: Bump to 08.04.00.004 release Updated the linux rt version for 08.04.00.004 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-07 15:18:31 -05:00
Ryan Eatmon	6d4df71253	linux-ti-staging: Bump to 08.04.00.004 release Updated the linux version for 08.04.00.004 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-07 15:18:31 -05:00
Ryan Eatmon	80292f272c	u-boot-ti-staging: Bump to 08.04.00.004 release Updated the u-boot version for 08.04.00.004 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-07 15:18:31 -05:00
Ryan Eatmon	3621d7392d	conf: machine: j721s2: add new dtb for GESI The following commits in ti-linux-5.10.y kernel has introduced a new dtb. commit: 9b05b2a89ff ("arm64: dts: ti: Add overlay for GESI to enable main CPSW2G in J721S2") This patch on j721s2 conf is to include the new dtb. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-07-06 11:16:22 -05:00
Andrew Davis	d3286bcd8b	linux-ti-staging: Unblock SA2UL for AM64x and J7200 HS devices The SA2UL driver now works on HS devices, unblock this. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-30 12:44:06 -05:00
Andrew Davis	b301f71f30	optee-os: Use software RNG on AM62x and J721s2 The TRNG driver is not currently functional for these two platforms. Disable the TRNG driver until fixed. Reported-by: Vignesh Raghavendra <vigneshr@ti.com> Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-30 12:43:30 -05:00
Ryan Eatmon	1f3f4fe7e4	linux-ti-staging-rt: Bump to 08.04.00.003 release Updated the linux rt version for 08.04.00.003 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-30 12:28:24 -05:00
Ryan Eatmon	6490507db4	linux-ti-staging: Bump to 08.04.00.003 release Updated the linux version for 08.04.00.003 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-30 12:27:47 -05:00
Ryan Eatmon	bfefccdef4	u-boot-ti-staging: Bump to 08.04.00.003 release Updated the u-boot version for 08.04.00.003 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-30 12:27:06 -05:00
LCPD Automation Script	9193f1e412	linux-ti-staging: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17 Updated the value(s) for: SRCREV Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-28 12:24:54 -05:00
LCPD Automation Script	40b882b18e	linux-ti-staging-rt: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17 Updated the value(s) for: SRCREV Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-28 12:24:54 -05:00
LCPD Automation Script	0d133ec319	u-boot-ti-staging: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17 Updated the value(s) for: SRCREV Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-28 12:24:54 -05:00
Ryan Eatmon	0c27a2802f	conf: machine: wic: Fix j721s2-hs-evm image boot partition This patch is to align with a recent change to how the HS platforms are setup in the /boot partition. Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-23 12:57:24 -05:00
Ryan Eatmon	280e2b4d32	ti-linux-fw: Bump to 08.04.00.002 release Updated the ti-linux-fw version for 08.04.00.002 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-23 09:41:23 -05:00
Ryan Eatmon	a0312b2185	linux-ti-staging-rt: Bump to 08.04.00.002 release Updated the linux rt version for 08.04.00.002 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-23 09:41:23 -05:00
Ryan Eatmon	aab90d9a14	linux-ti-staging: Bump to 08.04.00.002 release Updated the linux version for 08.04.00.002 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-23 09:41:23 -05:00
Ryan Eatmon	a133fea589	u-boot-ti-staging: Bump to 08.04.00.002 release Updated the u-boot version for 08.04.00.002 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-23 09:41:23 -05:00
Manorit Chawdhry	5e1204d728	conf: machine: wic: Fix HS image boot partition IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to incomplete binaries in /boot and the naming of the binaries were not correct. Fixes /boot partition for HS devices. Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> [afd: Extended fix to all HS platforms] Signed-off-by: Andrew Davis <afd@ti.com> Acked-by: Manorit Chawdhry <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-23 09:22:05 -05:00
Bryan Brattlof	c020b3c4f2	k3conf: update SRCREV to add J721S2 support update the SHA of k3conf to pickup j721s2 support Signed-off-by: Bryan Brattlof <bb@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-23 09:22:05 -05:00
Andrew Davis	f8182afdcf	optee: Upgrade to upstream 3.17.0 Update to the latest upstream master which is 3.17. We do this to add HUK and AM64x/AM62x support. With this we need to also switch OPTEEMACHINE for AM64x/AM62x. To build against the latest OP-TEE the support recipes need updated also. Move these here into meta-ti so that builds will still work when not using meta-arago-distro. The fix patches do not look to be needed anymore. While here switch to git checkout with https. NOTE: The latest OP-TEE requires SYSFW 8.04+ Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-20 12:32:57 -05:00
Andrew Davis	26998f4307	trusted-firmware-a: Update to latest upstream master For TF-A we work against upstream first, our fork has only been used in the rare cases we need to ship a feature before we can get it upstream. This is not currently the case so lets switch to upstream repo until there is a need for our fork. Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-20 12:32:57 -05:00
Ryan Eatmon	2ec2daedd3	ti-linux-fw: Bump to 08.04.00.001 release Updated the ti-linux-fw version for 08.04.00.001 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-16 07:03:54 -05:00
Ryan Eatmon	d5b45b5e83	linux-ti-staging-rt: Bump to 08.04.00.001 release Updated the linux rt version for 08.04.00.001 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-16 07:03:54 -05:00
Ryan Eatmon	a3ebde69e9	linux-ti-staging: Bump to 08.04.00.001 release Updated the linux version for 08.04.00.001 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-16 07:03:54 -05:00
Ryan Eatmon	c4d174d0f5	u-boot-ti-staging: Bump to 08.04.00.001 release Updated the u-boot version for 08.04.00.001 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-16 07:03:54 -05:00
Ryan Eatmon	cef5d9ec7a	u-boot: Bump to verison that supports j721s2-hs-evm Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-15 13:47:15 -05:00
Jayesh Choudhary	9704fd57a9	cnm-wave-fw: add compatible for j721s2-hs-evm Add the HS platform to the compatible list in the recipe. Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-15 13:47:15 -05:00
Jayesh Choudhary	cf62b56f21	ti-graphics: Add j721s2-hs-evm as a compatible machine Add HS platform to the list of compatible machines. Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-15 13:47:15 -05:00
Jayesh Choudhary	518ffd3483	j721s2-hs: changes to support new hs platform Changes to support new j721s2-hs platform in: 1) ti-sci-fw_git: Update firmware prefix for j721s2-hs 2) atf: sign the image 3) u-boot: Add u-boot-spl image for combined boot image 4) optee: sign the image Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-15 13:47:15 -05:00
Jayesh Choudhary	b5a092b49e	ti-rtos-firmware: Add j721s2 hs support Sign the DM firmware for j721s2 similar to j7200 hs. Duplicate all j721s2 entries for j721s2-hs as we cannot use same keyword for match between j721s2-evm and j721s2-hs-evm. Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-15 13:47:15 -05:00
Jayesh Choudhary	b20073dcb2	conf: machine: Add j721s2 hs platform Machine conf for J721S2 HS platform. Used j7200 hs as reference. Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-15 13:47:15 -05:00
Andrew Davis	1f68751baa	conf: machine: am64xx: Add missing dtbo Add missing k3-am642-evm-icssg1-dualemac-mii.dtbo. Reported-by: Judith Mendez <jm@ti.com> Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-06-13 15:19:14 -05:00
Ryan Eatmon	e99d9aa3fc	ti-linux-fw: Bump to 08.03.00.005 release Updated the ti-linux-fw version for 08.03.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-05-20 13:27:39 -05:00
Ryan Eatmon	cce0cfdc55	linux-ti-staging-rt: Bump to 08.03.00.005 release Updated the linux rt version for 08.03.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-05-20 13:27:39 -05:00
Ryan Eatmon	5048aa3464	linux-ti-staging: Bump to 08.03.00.005 release Updated the linux version for 08.03.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-05-20 13:27:39 -05:00
Ryan Eatmon	8d521a5cda	u-boot-ti-staging: Bump to 08.03.00.005 release Updated the u-boot version for 08.03.00.005 Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-05-20 13:27:39 -05:00
Praneeth Bajjuri	c451221ad8	conf: machine: am62xx: add new dtb for low-power The following commits in ti-linux-5.10.y kernel has introduced new dtbs. a minimal skeleton and a lpm (low-power-mode) demo dtb. commit c161df7b1ea0 ("arm64: dts: ti: Introduce k3-am625-sk-lpmdemo") commit 61df7fcf9307 ("arm64: dts: ti: introduce minimal dt for am625") This patch on am62xx conf is to include the new dtbs. Reported-by: Dave Gerlach <d-gerlach@ti.com> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>	2022-05-18 09:31:41 -05:00