diff options
145 files changed, 1630 insertions, 544 deletions
diff --git a/classes/ti-pdk-fetch.bbclass b/classes/ti-pdk-fetch.bbclass index cacd71a4..0efc4dd0 100644 --- a/classes/ti-pdk-fetch.bbclass +++ b/classes/ti-pdk-fetch.bbclass @@ -1,6 +1,6 @@ -TI_PDK_GIT_URI ?= "git://git.ti.com/processor-sdk/pdk.git" +TI_PDK_GIT_URI ?= "git://git.ti.com/git/processor-sdk/pdk.git" TI_PDK_GIT_BRANCH ?= "master" -TI_PDK_GIT_PROTOCOL ?= "git" +TI_PDK_GIT_PROTOCOL ?= "https" TI_PDK_SRCREV ?= "a1ace885998e9adbcbbd0abf8b9ded6ba9ec54ff" TI_PDK_VERSION ?= "2020.5.6" diff --git a/conf/machine/am57xx-evm.conf b/conf/machine/am57xx-evm.conf index afcfbb43..2fde75fe 100644 --- 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)}" diff --git a/conf/machine/am62axx-evm-k3r5-gp.conf b/conf/machine/am62axx-evm-k3r5-gp.conf new file mode 100644 index 00000000..962413c3 --- /dev/null +++ b/conf/machine/am62axx-evm-k3r5-gp.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@NAME: AM62A GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62A GP EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62ax" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +SYSFW_TIBOOT3_SYMLINK = "" +SYSFW_SYMLINK = "" + +UBOOT_MACHINE = "am62ax_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62axx-evm-k3r5-hs-fs.conf b/conf/machine/am62axx-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..2d69d06c --- /dev/null +++ b/conf/machine/am62axx-evm-k3r5-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM62A HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62A HS-FS EVM (R5F core) + +# Booting HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-fs" + +SYSFW_SOC = "am62ax" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62ax_evm_r5_defconfig" diff --git a/conf/machine/am62axx-evm-k3r5-hs-se.conf b/conf/machine/am62axx-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..c828606c --- /dev/null +++ b/conf/machine/am62axx-evm-k3r5-hs-se.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: AM62A HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62A HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am62ax" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +SYSFW_TIBOOT3_SYMLINK = "" +SYSFW_SYMLINK = "" + +UBOOT_MACHINE = "am62ax_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62axx-evm.conf b/conf/machine/am62axx-evm.conf new file mode 100644 index 00000000..2fd91bd7 --- /dev/null +++ b/conf/machine/am62axx-evm.conf @@ -0,0 +1,30 @@ +#@TYPE: Machine +#@NAME: AM62AXX EVM +#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM + +require conf/machine/include/am62axx.inc + +KERNEL_DEVICETREE = " \ + ti/k3-am62a7-sk.dtb \ + ti/k3-am62a7-fpdlink-ov2312-0-0.dtbo \ + ti/k3-am62a7-fpdlink-ov2312-0-1.dtbo \ + ti/k3-am62a7-fpdlink-ov2312-0-2.dtbo \ + ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \ + ti/k3-am62a7-fpdlink-sk-fusion.dtbo \ + ti/k3-am62a7-sk-csi2-imx219.dtbo \ + ti/k3-am62a7-sk-ethernet-dc01.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ +" + +UBOOT_MACHINE = "am62ax_evm_a53_defconfig" + +SPL_BINARY = "tispl.bin_HS" +UBOOT_BINARY = "u-boot.img_HS" +UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/am62xx-evm-k3r5.conf b/conf/machine/am62xx-evm-k3r5-gp.conf index 724a8d4a..ab18301a 100644 --- a/conf/machine/am62xx-evm-k3r5.conf +++ b/conf/machine/am62xx-evm-k3r5-gp.conf @@ -8,4 +8,11 @@ SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "" + UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62xx-evm-k3r5-hs-fs.conf b/conf/machine/am62xx-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..0f016547 --- /dev/null +++ b/conf/machine/am62xx-evm-k3r5-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM62xx HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx HS-FS EVM (R5F core) + +# Booting HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-fs" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" diff --git a/conf/machine/am62xx-evm-k3r5-hs-se.conf b/conf/machine/am62xx-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..913e69fa --- /dev/null +++ b/conf/machine/am62xx-evm-k3r5-hs-se.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: AM62xx HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf index cbab26dd..b4904eca 100644 --- a/conf/machine/am62xx-evm.conf +++ b/conf/machine/am62xx-evm.conf @@ -11,6 +11,15 @@ KERNEL_DEVICETREE = " \ ti/k3-am625-skeleton.dtb \ ti/k3-am625-sk-lpmdemo.dtb \ ti/k3-am625-sk-csi2-ov5640.dtbo \ + ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \ + ti/k3-am625-sk-ecap-capture.dtbo \ + ti/k3-am625-sk-hdmi-audio.dtbo \ + ti/k3-am625-sk-mcan.dtbo \ + ti/k3-am625-sk-oldi-panel.dtbo \ " UBOOT_MACHINE = "am62x_evm_a53_defconfig" + +SPL_BINARY = "tispl.bin_HS" +UBOOT_BINARY = "u-boot.img_HS" +UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf new file mode 100644 index 00000000..0178fcfc --- /dev/null +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM62xx LPSK HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-FS EVM (R5F core) + +# Booting HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-fs" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" diff --git a/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf new file mode 100644 index 00000000..b44cbe20 --- /dev/null +++ b/conf/machine/am62xx-lp-evm-k3r5-hs-se.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: AM62xx LPSK HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-SE EVM (R5F core) + +# Booting HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-hs-se" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-hs-se.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62xx-lp-evm-k3r5.conf b/conf/machine/am62xx-lp-evm-k3r5.conf new file mode 100644 index 00000000..0aaca286 --- /dev/null +++ b/conf/machine/am62xx-lp-evm-k3r5.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@NAME: AM62XX LP GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core) + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-gp" + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/am62xx-lp-evm.conf b/conf/machine/am62xx-lp-evm.conf new file mode 100644 index 00000000..5efca18d --- /dev/null +++ b/conf/machine/am62xx-lp-evm.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: AM62XX LP EVM +#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM + +require conf/machine/include/am62xx-lp.inc + +MACHINE_FEATURES += "gpu" + +KERNEL_DEVICETREE = " \ + ti/k3-am62x-lp-sk.dtb \ + ti/k3-am625-skeleton.dtb \ + ti/k3-am625-sk-lpmdemo.dtb \ + ti/k3-am625-sk-csi2-ov5640.dtbo \ + ti/k3-am62x-lp-sk-oldi-panel.dtbo \ +" + +SPL_BINARY = "tispl.bin_HS" +UBOOT_BINARY = "u-boot.img_HS" +UBOOT_SYMLINK = "u-boot.img" + +UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" diff --git a/conf/machine/am64xx-evm-k3r5-gp.conf b/conf/machine/am64xx-evm-k3r5-gp.conf new file mode 100644 index 00000000..c599ee47 --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-gp.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM64xx GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core) + +# Booting GP requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-gp" + +SYSFW_SOC = "am64x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..1139fe4a --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf @@ -0,0 +1,14 @@ +#@TYPE: Machine +#@NAME: AM64xx SR2.0 HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core) + +# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-sr2-hs-fs" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf new file mode 100644 index 00000000..f2aeca6d --- /dev/null +++ b/conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: AM64xx SR2.0 HS-SE EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core) + +# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-sr2-hs-se" + +SYSFW_SOC = "am64x_sr2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "am64x_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}" diff --git a/conf/machine/am64xx-evm-k3r5.conf b/conf/machine/am64xx-evm-k3r5.conf deleted file mode 100644 index afd36b72..00000000 --- a/conf/machine/am64xx-evm-k3r5.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am64x_evm_r5_defconfig" diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf deleted file mode 100644 index d12c030f..00000000 --- a/conf/machine/am64xx-hs-evm-k3r5.conf +++ /dev/null @@ -1,14 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM (R5F) -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am64x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "hs" -SYSFW_SYMLINK = "" - -UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf deleted file mode 100644 index 44e81463..00000000 --- a/conf/machine/am64xx-hs-evm.conf +++ /dev/null @@ -1,22 +0,0 @@ -#@TYPE: Machine -#@NAME: AM64xx HS EVM -#@DESCRIPTION: Machine configuration for the TI AM64xx HS EVM - -require conf/machine/include/am64xx.inc - -UBOOT_MACHINE = "am64x_hs_evm_a53_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" -SPL_BINARYNAME = "tispl.bin" -UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/am65xx-evm-k3r5.conf b/conf/machine/am65xx-evm-k3r5.conf index bd17474e..a484e444 100644 --- a/conf/machine/am65xx-evm-k3r5.conf +++ b/conf/machine/am65xx-evm-k3r5.conf @@ -9,4 +9,10 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" SYSFW_SYMLINK = "" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/conf/machine/am65xx-hs-evm-k3r5.conf b/conf/machine/am65xx-hs-evm-k3r5.conf index d6d4b1e3..d9041c9d 100644 --- a/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/conf/machine/am65xx-hs-evm-k3r5.conf @@ -9,6 +9,10 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" SYSFW_SYMLINK = "" -UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf index e4eebb6a..2c1256d0 100644 --- a/conf/machine/am65xx-hs-evm.conf +++ b/conf/machine/am65xx-hs-evm.conf @@ -6,17 +6,6 @@ require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_hs_evm_a53_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" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf index db4a5e1c..12820573 100644 --- 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 \ diff --git a/conf/machine/include/am62axx.inc b/conf/machine/include/am62axx.inc new file mode 100644 index 00000000..6ee3accc --- /dev/null +++ b/conf/machine/include/am62axx.inc @@ -0,0 +1,30 @@ +require conf/machine/include/k3.inc +SOC_FAMILY_append = ":am62axx" + +MACHINE_FEATURES += "screen touchscreen" + +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +TFA_K3_SYSTEM_SUSPEND = "1" + +# Default tiboot3.bin on AM62A is for HS-FS +BBMULTICONFIG = "k3r5-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am62ax-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE +BBMULTICONFIG += "k3r5-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am62ax-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" + +TFA_BOARD = "lite" +OPTEEMACHINE = "k3-am62x" +OPTEEOUTPUTMACHINE = "k3" diff --git a/conf/machine/include/am62xx-lp.inc b/conf/machine/include/am62xx-lp.inc new file mode 100644 index 00000000..02937662 --- /dev/null +++ b/conf/machine/include/am62xx-lp.inc @@ -0,0 +1,24 @@ +require conf/machine/include/k3.inc +SOC_FAMILY_append = ":am62xx" + +MACHINE_FEATURES += "screen touchscreen" + +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +TFA_K3_SYSTEM_SUSPEND = "1" + +# Default tiboot3.bin on AM62x LP is for HS-FS +BBMULTICONFIG = "k3r5-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62x LP is for HS-FS, add a version for HS-SE +BBMULTICONFIG += "k3r5-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" + +TFA_BOARD = "lite" +OPTEEMACHINE = "k3-am62x" +OPTEEOUTPUTMACHINE = "k3" diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc index ff857b97..6b2c0da3 100644 --- a/conf/machine/include/am62xx.inc +++ b/conf/machine/include/am62xx.inc @@ -8,12 +8,23 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_SYSTEM_SUSPEND = "1" -# AM62 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" +# Default tiboot3.bin on AM62x is for HS-FS +BBMULTICONFIG = "k3r5-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-hs-fs:ti-sci-fw:do_deploy" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am62x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE +BBMULTICONFIG += "k3r5-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am62x-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy" TFA_BOARD = "lite" -OPTEEMACHINE = "k3-am65x" +OPTEEMACHINE = "k3-am62x" OPTEEOUTPUTMACHINE = "k3" diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 7646c70a..913d95e6 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -10,17 +10,29 @@ 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 \ " -# AM64 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" +# Default tiboot3.bin on AM64x is for SR2.0 HS-FS +BBMULTICONFIG = "k3r5-sr2-hs-fs" +do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP +BBMULTICONFIG += "k3r5-gp" +IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE +BBMULTICONFIG += "k3r5-sr2-hs-se" +IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se: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 diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc index 1898f19c..b70d212f 100644 --- a/conf/machine/include/am65xx.inc +++ b/conf/machine/include/am65xx.inc @@ -22,9 +22,12 @@ KERNEL_DEVICETREE = " \ BBMULTICONFIG += "k3r5-sr2" -# Use default IMAGE_BOOT_FILES_LEGACY files +# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb +IMAGE_BOOT_FILES += "sysfw.itb" + # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0 IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" + do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc index d3eda1a8..c187f299 100644 --- a/conf/machine/include/j7.inc +++ b/conf/machine/include/j7.inc @@ -4,8 +4,6 @@ SOC_FAMILY_append = ":j7" OPTEEMACHINE = "k3-j721e" OPTEEOUTPUTMACHINE = "k3" -# Use default IMAGE_BOOT_FILES_LEGACY files - # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "j721e j7200" TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm" diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index e0970698..2a74f71b 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -15,13 +15,20 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES = "Image vmlinux.gz" +KERNEL_IMAGETYPES = "Image fitImage" +KERNEL_CLASSES += "kernel-fitimage" UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +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" EXTRA_IMAGEDEPENDS += "virtual/bootloader" @@ -40,12 +47,11 @@ 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 ?= "${IMAGE_BOOT_FILES_LEGACY}" +IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin" WKS_FILE ?= "sdimage-2part.wks" do_image_wic[depends] += "virtual/bootloader:do_deploy" do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc index a32accae..c29d6c95 100644 --- a/conf/machine/include/k3r5.inc +++ b/conf/machine/include/k3r5.inc @@ -16,9 +16,11 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" SPL_BINARY = "" UBOOT_SUFFIX = "bin" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" PACKAGECONFIG_pn-u-boot-ti-staging = "" PACKAGECONFIG_pn-u-boot-ti-mainline = "" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc index 02225a4e..4f57e6d1 100644 --- a/conf/machine/include/omap-a15.inc +++ b/conf/machine/include/omap-a15.inc @@ -19,7 +19,7 @@ UBOOT_ARCH = "arm" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" -DEVICETREE_FILE = "${@d.getVar('KERNEL_DEVICETREE').replace("ti/","")}" +DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}" # Generate an extlinux.conf file UBOOT_EXTLINUX = "1" diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc index fc9af949..729b4274 100644 --- 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)}" diff --git a/conf/machine/j7-evm-k3r5.conf b/conf/machine/j7-evm-k3r5.conf index b9e8cc01..862b017c 100644 --- a/conf/machine/j7-evm-k3r5.conf +++ b/conf/machine/j7-evm-k3r5.conf @@ -8,4 +8,10 @@ SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" + UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/conf/machine/j7-evm.conf b/conf/machine/j7-evm.conf index 1f47f00c..5dd2f56b 100644 --- a/conf/machine/j7-evm.conf +++ b/conf/machine/j7-evm.conf @@ -9,11 +9,37 @@ MACHINE_FEATURES += "gpu" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb +IMAGE_BOOT_FILES += "sysfw.itb" + KERNEL_DEVICETREE = " \ ti/k3-j721e-common-proc-board.dtb \ ti/k3-j721e-proc-board-tps65917.dtb \ ti/k3-j721e-common-proc-board-infotainment.dtbo \ + ti/k3-j721e-cpb-csi2-ov5640.dtbo \ + ti/k3-j721e-fpdlink-cpb-fusion.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ ti/k3-j721e-sk.dtb \ + ti/k3-j721e-fpdlink-sk-fusion.dtbo \ + ti/k3-j721e-sk-csi2-ov5640.dtbo \ + ti/k3-j721e-sk-rpi-cam-imx219.dtbo \ + ti/k3-j721e-common-proc-board-uarts.dtbo \ + ti/k3-j7200-mcspi-loopback.dtbo \ " UBOOT_MACHINE = "j721e_evm_a72_config" diff --git a/conf/machine/j7-hs-evm-k3r5.conf b/conf/machine/j7-hs-evm-k3r5.conf index 53a7016f..e4b233db 100644 --- a/conf/machine/j7-hs-evm-k3r5.conf +++ b/conf/machine/j7-hs-evm-k3r5.conf @@ -7,7 +7,12 @@ require conf/machine/include/k3r5.inc SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" +SYSFW_SYMLINK = "" -UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf index f2e3ccf5..68d36d5f 100644 --- a/conf/machine/j7-hs-evm.conf +++ b/conf/machine/j7-hs-evm.conf @@ -6,25 +6,14 @@ require conf/machine/j7-evm.conf UBOOT_MACHINE = "j721e_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" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" +UBOOT_SYMLINK = "u-boot.img" +SYSFW_SYMLINK = "" BBMULTICONFIG += "k3r5-sr1-1" -# Use default IMAGE_BOOT_FILES_LEGACY files # Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0 IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb" do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7200-evm.conf b/conf/machine/j7200-evm.conf index 2565c90c..1e9db37b 100644 --- a/conf/machine/j7200-evm.conf +++ b/conf/machine/j7200-evm.conf @@ -9,12 +9,11 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" KERNEL_DEVICETREE = " \ ti/k3-j7200-common-proc-board.dtb \ + ti/k3-j7200-mcspi-loopback.dtbo \ + ti/k3-j7200-common-proc-board-uarts.dtbo \ " UBOOT_MACHINE = "j7200_evm_a72_config" -# J7200 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" - do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/conf/machine/j7200-hs-evm-k3r5.conf b/conf/machine/j7200-hs-evm-k3r5.conf index 488f19ec..3fe06e74 100644 --- a/conf/machine/j7200-hs-evm-k3r5.conf +++ b/conf/machine/j7200-hs-evm-k3r5.conf @@ -4,10 +4,8 @@ require conf/machine/include/k3r5.inc -SYSFW_SOC = "j7200" +SYSFW_SOC = "j7200_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf index a5bd637e..dc928974 100644 --- a/conf/machine/j7200-hs-evm.conf +++ b/conf/machine/j7200-hs-evm.conf @@ -6,17 +6,6 @@ require conf/machine/j7200-evm.conf UBOOT_MACHINE = "j7200_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" -SPL_BINARYNAME = "tispl.bin" UBOOT_BINARY = "u-boot.img_HS" -IMAGE_BOOT_FILES = "${UBOOT_BINARY}" - -TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" +UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/j721s2-evm-k3r5-gp.conf b/conf/machine/j721s2-evm-k3r5-gp.conf new file mode 100644 index 00000000..06456ef7 --- /dev/null +++ b/conf/machine/j721s2-evm-k3r5-gp.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: J721S2 GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721S2 GP EVM (R5F core) + +# Booting GP requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-gp" + +SYSFW_SOC = "j721s2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" + +UBOOT_MACHINE = "j721s2_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf b/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf new file mode 100644 index 00000000..786338a9 --- /dev/null +++ b/conf/machine/j721s2-evm-k3r5-sr1-hs-fs.conf @@ -0,0 +1,15 @@ +#@TYPE: Machine +#@NAME: J721S2 HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J721S2 HS-FS EVM (R5F core) + +# Booting HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-sr1-hs-fs" + +SYSFW_SOC = "j721s2" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" +SYSFW_TIBOOT3_SYMLINK = "" + +UBOOT_MACHINE = "j721s2_evm_r5_defconfig" diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf index e5ed0b73..27d030d0 100644 --- a/conf/machine/j721s2-evm.conf +++ b/conf/machine/j721s2-evm.conf @@ -6,19 +6,52 @@ require conf/machine/include/j7.inc MACHINE_FEATURES += "gpu" -SERIAL_CONSOLES = "115200;ttyS10" +SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" +OPTEEMACHINE = "k3-j784s4" OPTEE_K3_USART = "0x8" KERNEL_DEVICETREE = " \ + ti/k3-am68-sk-base-board.dtb \ + ti/k3-am68-sk-bb-csi2-ov5640.dtbo \ + ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \ + ti/k3-am68-sk-fpdlink-fusion.dtbo \ + ti/k3-am68-sk-rpi-hdr-ehrpwm.dtbo \ + ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ ti/k3-j721s2-common-proc-board.dtb \ + ti/k3-j721s2-cpb-csi2-ov5640.dtbo \ + ti/k3-j721s2-fpdlink-cpb-fusion.dtbo \ + ti/k3-j721s2-gesi-exp-board.dtbo \ + ti/k3-j721s2-common-proc-board-uarts.dtbo \ + ti/k3-j7200-mcspi-loopback.dtbo \ " UBOOT_MACHINE = "j721s2_evm_a72_defconfig" -# J721S2 supports multi-certificate images, use the same -IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" +# Default tiboot3.bin on J721S2 is for GP +BBMULTICONFIG = "k3r5-gp" +do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS +BBMULTICONFIG += "k3r5-sr1-hs-fs" +IMAGE_BOOT_FILES += " tiboot3-j721s2-hs-fs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" diff --git a/conf/machine/j721s2-hs-evm-k3r5.conf b/conf/machine/j721s2-hs-evm-k3r5.conf new file mode 100644 index 00000000..a4d51904 --- /dev/null +++ b/conf/machine/j721s2-hs-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@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" diff --git a/conf/machine/j721s2-hs-evm.conf b/conf/machine/j721s2-hs-evm.conf new file mode 100644 index 00000000..2895787b --- /dev/null +++ b/conf/machine/j721s2-hs-evm.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine +#@NAME: J721S2 HS EVM +#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM + +require conf/machine/include/j7.inc + +MACHINE_FEATURES += "gpu" + +SERIAL_CONSOLES = "115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +TFA_K3_USART = "0x8" +OPTEEMACHINE = "k3-j784s4" +OPTEE_K3_USART = "0x8" + +KERNEL_DEVICETREE = " \ + ti/k3-j721s2-common-proc-board.dtb \ + ti/k3-j721s2-gesi-exp-board.dtbo \ +" + +UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig" + +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" + +SPL_BINARY = "tispl.bin_HS" +UBOOT_BINARY = "u-boot.img_HS" +UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/machine/j784s4-evm-k3r5-gp.conf b/conf/machine/j784s4-evm-k3r5-gp.conf new file mode 100644 index 00000000..5fd47b70 --- /dev/null +++ b/conf/machine/j784s4-evm-k3r5-gp.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: J784S4 GP EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 GP EVM (R5F core) + +# Booting GP requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-gp" + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" +SYSFW_TIBOOT3_SYMLINK = "tiboot3.bin" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" + +SPL_BINARY = "" +UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" +UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}" diff --git a/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf new file mode 100644 index 00000000..a81063bc --- /dev/null +++ b/conf/machine/j784s4-evm-k3r5-sr1-hs-fs.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: J784S4 HS-FS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 HS-FS EVM (R5F core) + +# Booting HS-FS requires different SYSFW, the rest is handled at runtime + +require conf/machine/include/k3r5.inc +SOC_FAMILY_append = ":k3r5-sr1-hs-fs" + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs-fs" +SYSFW_TIBOOT3_SYMLINK = "" +SYSFW_SYMLINK = "" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/conf/machine/j784s4-evm-k3r5.conf b/conf/machine/j784s4-evm-k3r5.conf new file mode 100644 index 00000000..04feebc6 --- /dev/null +++ b/conf/machine/j784s4-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/conf/machine/j784s4-evm.conf b/conf/machine/j784s4-evm.conf new file mode 100644 index 00000000..59deb8da --- /dev/null +++ b/conf/machine/j784s4-evm.conf @@ -0,0 +1,58 @@ +#@TYPE: Machine +#@NAME: J784S4 EVM +#@DESCRIPTION: Machine configuration for the TI J784S4 EVM + +require conf/machine/include/j7.inc + +MACHINE_FEATURES += "gpu" + +SERIAL_CONSOLES = "115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +TFA_K3_USART = "0x8" +OPTEEMACHINE = "k3-j784s4" +OPTEE_K3_USART = "0x8" + +KERNEL_DEVICETREE = " \ + ti/k3-am69-sk.dtb \ + ti/k3-am69-sk-csi2-ov5640.dtbo \ + ti/k3-am69-sk-ddr-mem-carveout.dtbo \ + ti/k3-am69-sk-fpdlink-fusion.dtbo \ + ti/k3-am69-sk-rpi-hdr-ehrpwm.dtbo \ + ti/k3-am69-sk-rpi-cam-imx219.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-cm-1-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-0.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-1.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-2.dtbo \ + ti/k3-j721e-fpdlink-imx390-rcm-1-3.dtbo \ + ti/k3-j784s4-evm.dtb \ + ti/k3-j784s4-evm-csi2-ov5640.dtbo \ + ti/k3-j784s4-fpdlink-fusion.dtbo \ + ti/k3-j784s4-evm-uarts.dtbo \ + ti/k3-j7200-mcspi-loopback.dtbo \ +" + +UBOOT_MACHINE = "j784s4_evm_a72_defconfig" + +# Default tiboot3.bin on J784S4 is for GP +BBMULTICONFIG = "k3r5-gp" +do_image_wic[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5-gp:ti-sci-fw:do_deploy" + +# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS +BBMULTICONFIG += "k3r5-sr1-hs-fs" +IMAGE_BOOT_FILES += " tiboot3-j784s4-hs-fs-evm.bin" +do_image_wic[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] += "mc::k3r5-sr1-hs-fs:ti-sci-fw:do_deploy" + +TFA_BOARD = "j784s4" diff --git a/conf/machine/j784s4-hs-evm-k3r5.conf b/conf/machine/j784s4-hs-evm-k3r5.conf new file mode 100644 index 00000000..80a228a0 --- /dev/null +++ b/conf/machine/j784s4-hs-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J784S4 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j784s4" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j784s4_evm_r5_defconfig" diff --git a/conf/machine/j784s4-hs-evm.conf b/conf/machine/j784s4-hs-evm.conf new file mode 100644 index 00000000..91ef3d6f --- /dev/null +++ b/conf/machine/j784s4-hs-evm.conf @@ -0,0 +1,28 @@ +#@TYPE: Machine +#@NAME: J784S4 HS EVM +#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM + +require conf/machine/include/j7.inc + +MACHINE_FEATURES += "gpu" + +SERIAL_CONSOLES = "115200;ttyS2" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +TFA_K3_USART = "0x8" +OPTEEMACHINE = "k3-j784s4" +OPTEE_K3_USART = "0x8" + +KERNEL_DEVICETREE = " \ + ti/k3-j784s4-evm.dtb \ +" + +UBOOT_MACHINE = "j784s4_evm_a72_defconfig" + +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" + +TFA_BOARD = "j784s4" + +SPL_BINARY = "tispl.bin_HS" +UBOOT_BINARY = "u-boot.img_HS" +UBOOT_SYMLINK = "u-boot.img" diff --git a/conf/multiconfig/k3r5-gp.conf b/conf/multiconfig/k3r5-gp.conf new file mode 100644 index 00000000..1d86dcc7 --- /dev/null +++ b/conf/multiconfig/k3r5-gp.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-gp" diff --git a/conf/multiconfig/k3r5-hs-fs.conf b/conf/multiconfig/k3r5-hs-fs.conf new file mode 100644 index 00000000..c6d58ead --- /dev/null +++ b/conf/multiconfig/k3r5-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-hs-fs" diff --git a/conf/multiconfig/k3r5-hs-se.conf b/conf/multiconfig/k3r5-hs-se.conf new file mode 100644 index 00000000..701f8e88 --- /dev/null +++ b/conf/multiconfig/k3r5-hs-se.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-hs-se" diff --git a/conf/multiconfig/k3r5-sr1-hs-fs.conf b/conf/multiconfig/k3r5-sr1-hs-fs.conf new file mode 100644 index 00000000..2fa28c95 --- /dev/null +++ b/conf/multiconfig/k3r5-sr1-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5-sr1.conf + +MACHINE_append = "-hs-fs" diff --git a/conf/multiconfig/k3r5-sr1.conf b/conf/multiconfig/k3r5-sr1.conf new file mode 100644 index 00000000..2b87de8a --- /dev/null +++ b/conf/multiconfig/k3r5-sr1.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-sr1" diff --git a/conf/multiconfig/k3r5-sr2-hs-fs.conf b/conf/multiconfig/k3r5-sr2-hs-fs.conf new file mode 100644 index 00000000..8e6b5c68 --- /dev/null +++ b/conf/multiconfig/k3r5-sr2-hs-fs.conf @@ -0,0 +1,3 @@ +require k3r5-sr2.conf + +MACHINE_append = "-hs-fs" diff --git a/conf/multiconfig/k3r5-sr2-hs-se.conf b/conf/multiconfig/k3r5-sr2-hs-se.conf new file mode 100644 index 00000000..69e6d0c8 --- /dev/null +++ b/conf/multiconfig/k3r5-sr2-hs-se.conf @@ -0,0 +1,3 @@ +require k3r5-sr2.conf + +MACHINE_append = "-hs-se" diff --git a/recipes-bsp/abefw/abefw_1.0.14.bb b/recipes-bsp/abefw/abefw_1.0.14.bb index 302bdcde..03580e80 100644 --- a/recipes-bsp/abefw/abefw_1.0.14.bb +++ b/recipes-bsp/abefw/abefw_1.0.14.bb @@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "pandaboard|omap5-evm" -SRC_URI = "git://git.ti.com/glsdk/abefw-omap4plus.git;protocol=git" +SRC_URI = "git://git.ti.com/git/glsdk/abefw-omap4plus.git;protocol=https" S = "${WORKDIR}/git" diff --git a/recipes-bsp/audk2g-addon/audk2g-addon-rtos_git.bb b/recipes-bsp/audk2g-addon/audk2g-addon-rtos_git.bb index 0cb9ff17..f42caa36 100644 --- a/recipes-bsp/audk2g-addon/audk2g-addon-rtos_git.bb +++ b/recipes-bsp/audk2g-addon/audk2g-addon-rtos_git.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://audk2gaddonver.h;beginline=8;endline=47;md5=7a3996aaf COMPATIBLE_MACHINE = "k2g" PACKAGE_ARCH = "${MACHINE_ARCH}" -AUDK2G_ADDON_GIT_URI = "git://git.ti.com/processor-sdk/audk2g-addon.git" -AUDK2G_ADDON_GIT_PROTOCOL = "git" +AUDK2G_ADDON_GIT_URI = "git://git.ti.com/git/processor-sdk/audk2g-addon.git" +AUDK2G_ADDON_GIT_PROTOCOL = "https" AUDK2G_ADDON_GIT_BRANCH = "master" AUDK2G_ADDON_GIT_DESTSUFFIX = "git/ti/addon/audk2g" diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb index 9c436d1c..f85c29f6 100644 --- a/recipes-bsp/boot-monitor/boot-monitor_git.bb +++ b/recipes-bsp/boot-monitor/boot-monitor_git.bb @@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "u-boot-mkimage-native" -SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/processor-firmware/ks2-boot-monitor.git;protocol=https;branch=${BRANCH}" PV = "4.0+git${SRCPV}" diff --git a/recipes-bsp/bt-fw/bt-fw_git.bb b/recipes-bsp/bt-fw/bt-fw_git.bb index f3d740b1..c3f4415f 100644 --- a/recipes-bsp/bt-fw/bt-fw_git.bb +++ b/recipes-bsp/bt-fw/bt-fw_git.bb @@ -8,7 +8,7 @@ CLEANBROKEN = "1" SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4" BRANCH = "master" -SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb index 5cbbceb6..ce1add35 100644 --- a/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb +++ b/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb @@ -10,7 +10,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j7-evm|j7-hs-evm|j721s2-evm|j721s2-hs-evm|j784s4-evm|j784s4-hs-evm" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb b/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb index bbbc3ec1..37b2d108 100644 --- a/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb +++ b/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb @@ -9,7 +9,7 @@ PR = "r0" SRCREV = "fb484c5e54f2e31cf0a338d2927a06a2870bcc2c" BRANCH ?= "ti-v4.1.y" -SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb b/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb index 38f9a43e..dc323985 100644 --- a/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb +++ b/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb @@ -9,8 +9,8 @@ COMPATIBLE_MACHINE = "k2g|omapl137-evm" PACKAGE_ARCH = "${MACHINE_ARCH}" -CMB_ADDON_GIT_URI = "git://git.ti.com/processor-sdk/circmicarray-addon.git" -CMB_ADDON_GIT_PROTOCOL = "git" +CMB_ADDON_GIT_URI = "git://git.ti.com/git/processor-sdk/circmicarray-addon.git" +CMB_ADDON_GIT_PROTOCOL = "https" CMB_ADDON_GIT_BRANCH = "master" CMB_ADDON_GIT_DESTSUFFIX = "git/ti/addon" diff --git a/recipes-bsp/cmem/cmem.inc b/recipes-bsp/cmem/cmem.inc index f568fa81..b8171bb3 100644 --- a/recipes-bsp/cmem/cmem.inc +++ b/recipes-bsp/cmem/cmem.inc @@ -9,7 +9,7 @@ SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393" PV = "4.20.00.01+git${SRCPV}" -SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/ipc/ludev.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" COMPATIBLE_HOST ?= "null" diff --git a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb index 0c432de2..fac7bb06 100644 --- a/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb +++ b/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb @@ -13,22 +13,21 @@ PR = "${INC_PR}.1" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "j721s2-evm" +COMPATIBLE_MACHINE = "j721s2-evm|j721s2-hs-evm|j784s4-evm|j784s4-hs-evm|am62axx" PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}/git" TARGET_WAVE521C = "wave521c_codec_fw.bin" -SOURCE_WAVE521C = "wave521c_codec_fw.bin" -SOURCE_WAVE521C_j721s2-evm = "wave521c_j721s2_codec_fw.bin" +SOURCE_WAVE521C = "wave521c_k3_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}" ALTERNATIVE_PRIORITY = "10" # Set up names for the firmwares -ALTERNATIVE_${PN}_j7 = "\ +ALTERNATIVE_${PN} = "\ wave521c_codec_fw.bin" do_install() { diff --git a/recipes-bsp/common-csl-ip/common-csl-ip.inc b/recipes-bsp/common-csl-ip/common-csl-ip.inc index 23586fd7..a85d2059 100644 --- a/recipes-bsp/common-csl-ip/common-csl-ip.inc +++ b/recipes-bsp/common-csl-ip/common-csl-ip.inc @@ -8,8 +8,8 @@ PV = "03.03.00.17B" INC_PR = "r0" PE = "2" -CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git" -CSL_GIT_PROTOCOL ="git" +CSL_GIT_URI = "git://git.ti.com/git/keystone-rtos/common-csl-ip.git" +CSL_GIT_PROTOCOL ="https" CSL_GIT_BRANCH = "release" CSL_GIT_DESTSUFFIX = "git" diff --git a/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb index 8cb62b2a..ea16d11f 100755 --- a/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb +++ b/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb @@ -9,11 +9,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy inherit update-alternatives -PROTOCOL = "git" +PROTOCOL = "https" BRANCH = "master" SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5" -SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/dspdce-fw/dspdce-fw_git.bb b/recipes-bsp/dspdce-fw/dspdce-fw_git.bb index 6ddbe683..4f114412 100644 --- a/recipes-bsp/dspdce-fw/dspdce-fw_git.bb +++ b/recipes-bsp/dspdce-fw/dspdce-fw_git.bb @@ -8,7 +8,7 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "dsp" -SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git" +SRC_URI = "git://git.ti.com/git/glsdk/dspdce.git;protocol=https" SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8" diff --git a/recipes-bsp/dsptop/dsptop.inc b/recipes-bsp/dsptop/dsptop.inc index 31f775e2..ec159c75 100644 --- a/recipes-bsp/dsptop/dsptop.inc +++ b/recipes-bsp/dsptop/dsptop.inc @@ -3,6 +3,6 @@ SRCREV = "816485e68430bbec643eac9498bfa5303eb2c2e1" PV = "1.4.0" INC_PR = "r2" -SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/sdo-emu/dsptop.git;protocol=https;branch=${BRANCH}" BRANCH = "master" diff --git a/recipes-bsp/edma3-lld/edma3-lld.inc b/recipes-bsp/edma3-lld/edma3-lld.inc index 34d3170f..b076ab30 100644 --- a/recipes-bsp/edma3-lld/edma3-lld.inc +++ b/recipes-bsp/edma3-lld/edma3-lld.inc @@ -2,8 +2,8 @@ DESCRIPTION = "TI EDMA3 low level driver and test code" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea" -EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git" -EDMA3_LLD_GIT_PROTOCOL = "git" +EDMA3_LLD_GIT_URI = "git://git.ti.com/git/keystone-rtos/edma3_lld.git" +EDMA3_LLD_GIT_PROTOCOL = "https" EDMA3_LLD_GIT_BRANCH = "master" # Below commit ID corresponds to version 2.12.05.30E diff --git a/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb b/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb index bf8aba6a..f759e21e 100644 --- a/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb +++ b/recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://fault_mgmt.h;beginline=1;endline=41;md5=4be5df2b9c314 COMPATIBLE_MACHINE = "k2hk|k2e|k2l" PACKAGE_ARCH = "${MACHINE_ARCH}" -FAULT_MANAGEMENT_GIT_URI = "git://git.ti.com/keystone-rtos/fault_mgmt.git" -FAULT_MANAGEMENT_GIT_PROTOCOL = "git" +FAULT_MANAGEMENT_GIT_URI = "git://git.ti.com/git/keystone-rtos/fault_mgmt.git" +FAULT_MANAGEMENT_GIT_PROTOCOL = "https" FAULT_MANAGEMENT_GIT_BRANCH = "master" FAULT_MANAGEMENT_GIT_DESTSUFFIX = "git/ti/instrumentation/fault_mgmt" diff --git a/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb b/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb index d36bcd56..13060b9d 100644 --- a/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb +++ b/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb @@ -15,7 +15,7 @@ BRANCH = "ti-${PV}-k5.10" SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107" -SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git/src" diff --git a/recipes-bsp/hplib/hplib.inc b/recipes-bsp/hplib/hplib.inc index dda47344..f279ba42 100644 --- a/recipes-bsp/hplib/hplib.inc +++ b/recipes-bsp/hplib/hplib.inc @@ -5,8 +5,8 @@ DEVICELIST_k2hk = "k2h k2k" DEVICELIST_k2l = "k2l" DEVICELIST_k2e = "k2e" -HPLIB_GIT_URI = "git://git.ti.com/keystone-rtos/hplib.git" -HPLIB_GIT_PROTOCOL = "git" +HPLIB_GIT_URI = "git://git.ti.com/git/keystone-rtos/hplib.git" +HPLIB_GIT_PROTOCOL = "https" HPLIB_GIT_BRANCH = "master" # Below Commit ID corresponds to "DEV.HPLIB.01.01.00.08" diff --git a/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb b/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb index 59b75b3a..cdea82c8 100644 --- a/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb +++ b/recipes-bsp/ibl-boot/ibl-boot-rtos_git.bb @@ -19,8 +19,8 @@ COMPATIBLE_MACHINE = "c66x" CLEANBROKEN = "1" -IBL_BOOT_GIT_URI = "git://git.ti.com/keystone-rtos/ibl.git" -IBL_BOOT_GIT_PROTOCOL = "git" +IBL_BOOT_GIT_URI = "git://git.ti.com/git/keystone-rtos/ibl.git" +IBL_BOOT_GIT_PROTOCOL = "https" IBL_BOOT_GIT_BRANCH = "master" IBL_BOOT_SRCREV = "ed3f0989d8cdc813b7ca1ed899c4d84b63de3a75" diff --git a/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb b/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb index 93a8a3a1..a1c244fa 100644 --- a/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb +++ b/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb @@ -11,11 +11,11 @@ COMPATIBLE_MACHINE = "k3" PV = "1.0-git${SRCPV}" PACKAGE_ARCH = "${MACHINE_ARCH}" -PROTOCOL = "git" +PROTOCOL = "https" BRANCH = "master" SRCREV = "c9f7cfe61b67998a053fe145344ce0c9b5bb22aa" -SRC_URI = "git://git.ti.com/keystone-rtos/ipc-lld.git;protocol=${PROTOCOL};branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/keystone-rtos/ipc-lld.git;protocol=${PROTOCOL};branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/recipes-bsp/ipumm-fw/ipumm-fw_git.bb index 380c274a..219f915c 100644 --- a/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +++ b/recipes-bsp/ipumm-fw/ipumm-fw_git.bb @@ -11,7 +11,7 @@ REQUIRED_MACHINE_FEATURES = "mmip" RDEPENDS_${PN} = "libdce" -SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git" +SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https" SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" diff --git a/recipes-bsp/mad-utils/mad-utils-rtos_git.bb b/recipes-bsp/mad-utils/mad-utils-rtos_git.bb index 0144aad2..58227f8b 100644 --- a/recipes-bsp/mad-utils/mad-utils-rtos_git.bb +++ b/recipes-bsp/mad-utils/mad-utils-rtos_git.bb @@ -16,7 +16,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "c66x" BRANCH = "master" -SRC_URI = "git://git.ti.com/keystone-rtos/mad-utils.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/keystone-rtos/mad-utils.git;protocol=https;branch=${BRANCH}" SRCREV = "2458510f76eddfa837c2b83448965e233156944b" PR = "r0" diff --git a/recipes-bsp/mmap-lld/mmap-lld.inc b/recipes-bsp/mmap-lld/mmap-lld.inc index 7e11a4c5..79105da1 100644 --- a/recipes-bsp/mmap-lld/mmap-lld.inc +++ b/recipes-bsp/mmap-lld/mmap-lld.inc @@ -4,8 +4,8 @@ COMPATIBLE_MACHINE = "keystone" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b3315b8190036fe1c6a8263d02e15606" -MMAP_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/mmap-lld.git" -MMAP_LLD_GIT_PROTOCOL = "git" +MMAP_LLD_GIT_URI = "git://git.ti.com/git/keystone-rtos/mmap-lld.git" +MMAP_LLD_GIT_PROTOCOL = "https" MMAP_LLD_GIT_BRANCH = "master" MMAP_LLD_GIT_DESTSUFFIX = "git/ti/runtime/mmap" diff --git a/recipes-bsp/pktlib/pktlib.inc b/recipes-bsp/pktlib/pktlib.inc index af3f8bb1..8e4ac7c9 100644 --- a/recipes-bsp/pktlib/pktlib.inc +++ b/recipes-bsp/pktlib/pktlib.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://docs/Doxyfile;md5=91d01dc3788e1f405f000b2089191a0a" COMPATIBLE_MACHINE = "keystone" PACKAGE_ARCH = "${MACHINE_ARCH}" -PKTLIB_GIT_URI = "git://git.ti.com/keystone-rtos/pktlib.git" -PKTLIB_GIT_PROTOCOL = "git" +PKTLIB_GIT_URI = "git://git.ti.com/git/keystone-rtos/pktlib.git" +PKTLIB_GIT_PROTOCOL = "https" PKTLIB_GIT_BRANCH = "master" PKTLIB_GIT_DESTSUFFIX = "git/ti/runtime/pktlib" diff --git a/recipes-bsp/pm-lld/pm-lld-rtos_git.bb b/recipes-bsp/pm-lld/pm-lld-rtos_git.bb index 25fcb65e..f765e910 100644 --- a/recipes-bsp/pm-lld/pm-lld-rtos_git.bb +++ b/recipes-bsp/pm-lld/pm-lld-rtos_git.bb @@ -9,8 +9,8 @@ COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -PM_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/pm-lld.git" -PM_LLD_GIT_PROTOCOL = "git" +PM_LLD_GIT_URI = "git://git.ti.com/git/keystone-rtos/pm-lld.git" +PM_LLD_GIT_PROTOCOL = "https" PM_LLD_GIT_BRANCH = "master" diff --git 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 index 718c7845..9a5bc479 100644 --- 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|j784s4-evm|j784s4-hs-evm|am62xx" DEPENDS = "virtual/kernel" @@ -20,26 +20,25 @@ PROVIDES = "virtual/gpudriver" BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" SRC_URI = " \ - git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ + git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH} \ file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ " S = "${WORKDIR}/git" -SRCREV = "6d3d62a15ceb85b719c35f34c6c9e35f556b406b" +SRCREV = "1dd6291a5cad4f2b909fc2a14bd717a3bc5f0bb2" 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_j784s4-evm = "j784s4_linux" +TARGET_PRODUCT_j784s4-hs-evm = "j784s4_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_am62xx = "33.15.11.3" PVR_BUILD = "release" PVR_WS = "wayland" -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${TARGET_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' do_install() { make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index a1b0765c..796c4ec9 100644 --- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -20,7 +20,7 @@ PROVIDES = "virtual/gpudriver" BRANCH = "ti-img-sgx/${PV}/k5.10" -SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb index 1ceba057..e687e4b5 100644 --- a/recipes-bsp/pru/pru-icss_git.bb +++ b/recipes-bsp/pru/pru-icss_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PRU-Package-v6.1-Manifest.html;md5=1e37797ebe9254922f inherit update-alternatives BRANCH = "master" -SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/pru-software-support-package/pru-software-support-package.git;protocol=https;branch=${BRANCH}" SRCREV = "ae1decf0b494b2904e6157e1379691ffc468f0cf" PV = "6.1.0" diff --git a/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb index cf65e09a..e5446423 100644 --- a/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb +++ b/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "am65xx-evm|am64xx-evm" +COMPATIBLE_MACHINE = "am65xx-evm|am64xx" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/sa-lld/sa-lld.inc b/recipes-bsp/sa-lld/sa-lld.inc index d4993cb9..3f0947e2 100644 --- a/recipes-bsp/sa-lld/sa-lld.inc +++ b/recipes-bsp/sa-lld/sa-lld.inc @@ -3,8 +3,8 @@ COMPATIBLE_MACHINE = "k2hk|k2e|k2l" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/sa/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871" -SA_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/sa-lld.git" -SA_LLD_GIT_PROTOCOL = "git" +SA_LLD_GIT_URI = "git://git.ti.com/git/keystone-rtos/sa-lld.git" +SA_LLD_GIT_PROTOCOL = "https" SA_LLD_GIT_BRANCH = "master" SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa" diff --git a/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb b/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb index 442c4cb1..e683090a 100644 --- a/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb +++ b/recipes-bsp/serdes-diag/serdes-diag-rtos_git.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://serdes_diag.h;beginline=1;endline=42;;md5=68e7ce6fdc0 COMPATIBLE_MACHINE = "keystone|c66x|k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -SERDES_DIAG_GIT_URI = "git://git.ti.com/keystone-rtos/serdes_diag.git" -SERDES_DIAG_GIT_PROTOCOL = "git" +SERDES_DIAG_GIT_URI = "git://git.ti.com/git/keystone-rtos/serdes_diag.git" +SERDES_DIAG_GIT_PROTOCOL = "https" SERDES_DIAG_GIT_BRANCH = "master" SERDES_DIAG_GIT_DESTSUFFIX = "git/ti/diag/serdes_diag" diff --git a/recipes-bsp/srss-tc/srss-tc_git.bb b/recipes-bsp/srss-tc/srss-tc_git.bb index 483bde00..b94dc17f 100644 --- a/recipes-bsp/srss-tc/srss-tc_git.bb +++ b/recipes-bsp/srss-tc/srss-tc_git.bb @@ -10,7 +10,7 @@ BRANCH = "master" # This commit corresponds to tag DEV.SRSS-TC-01.00.00.01A SRCREV = "107cd1433ef5785e5647ef086a4cc77566506604" -SRC_URI = "git://git.ti.com/keystone-linux/srss-tc.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/keystone-linux/srss-tc.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/starterware/starterware.inc b/recipes-bsp/starterware/starterware.inc index 82b012ad..92e20e45 100644 --- a/recipes-bsp/starterware/starterware.inc +++ b/recipes-bsp/starterware/starterware.inc @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=35;md5=286cbb5dce3e34829 COMPATIBLE_MACHINE = "ti33x|ti43x" PACKAGE_ARCH = "${MACHINE_ARCH}" -STARTERWARE_GIT_URI = "git://git.ti.com/keystone-rtos/starterware.git" -STARTERWARE_GIT_PROTOCOL = "git" +STARTERWARE_GIT_URI = "git://git.ti.com/git/keystone-rtos/starterware.git" +STARTERWARE_GIT_PROTOCOL = "https" STARTERWARE_GIT_BRANCH = "master" # Below commit ID corresponds to "DEV.STARTERWARE.PROCSDK.02.01.01.12A" diff --git 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 index 48a17537..bd863c0a 100644 --- 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" @@ -13,6 +15,6 @@ EXTRA_OEMAKE = "CC="${CC}"" TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" -SRC_URI = "git://git.ti.com/jacinto7_multimedia/viddec-test-app.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/viddec-test-app.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git 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 index 3bb5d745..71f5cfbf 100644 --- 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" @@ -13,6 +15,6 @@ EXTRA_OEMAKE = "CC="${CC}"" TARGET_CC_ARCH += "${LDFLAGS}" BRANCH = "master" -SRC_URI = "git://git.ti.com/jacinto7_multimedia/videnc-test-app.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/videnc-test-app.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc index 3bfddf05..3ac3c95a 100644 --- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc +++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -20,18 +20,20 @@ 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 ?= "760434de173d1957823042b3c2daf0f45e1191cd" SRCREV = "${TI_LINUX_FW_SRCREV}" BRANCH ?= "ti-linux-firmware" -K3_IMAGE_GEN_SRCREV ?= "62872c7e285fa9b9af76a258a24d603f851769c3" +K3_IMAGE_GEN_SRCREV ?= "184ab513e6acb161c5f77a593ef976f3a4d93cda" SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}" SRCREV_FORMAT = "imggen" +K3_IMAGE_GEN_BRANCH ?= "master" + SRC_URI = " \ - git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH} \ - git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \ + git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH} \ + git://git.ti.com/git/k3-image-gen/k3-image-gen.git;protocol=https;branch=${K3_IMAGE_GEN_BRANCH};destsuffix=imggen;name=imggen \ " S = "${WORKDIR}/git" diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_0.1.1.50.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_0.1.1.50.bb index 9e68fdff..c8ca26bd 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_0.1.1.50.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_0.1.1.50.bb @@ -15,7 +15,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRCREV = "ab507546f0f3f217f4c782a20845856e14b38224" BRANCH ?= "ti-linux-firmware" -SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" TARGET = "ti-sci-firmware-k2g.bin" diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb index 099473b4..80c0b890 100644 --- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb +++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb @@ -1,12 +1,15 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc - -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_am64xx-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_am64xx-hs-evm-k3r5 = " virtual/bootloader" -DEPENDS_append_am62xx-evm-k3r5 = " virtual/bootloader" +require recipes-ti/includes/ti-paths.inc + +DEPENDS = "openssl-native u-boot-mkimage-native dtc-native virtual/bootloader" +DEPENDS_remove_am65xx-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_am65xx-evm-k3r5-sr2 = " virtual/bootloader" +DEPENDS_remove_am65xx-hs-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_am65xx-hs-evm-k3r5-sr2 = " virtual/bootloader" +DEPENDS_remove_j7-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_j7-hs-evm-k3r5 = " virtual/bootloader" +DEPENDS_remove_j7-hs-evm-k3r5-sr1-1 = " virtual/bootloader" +DEPENDS_append = " ${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else 'ti-k3-secdev-native' }" CLEANBROKEN = "1" PR = "${INC_PR}.2" @@ -17,33 +20,61 @@ COMPATIBLE_MACHINE_aarch64 = "null" PACKAGE_ARCH = "${MACHINE_ARCH}" -TI_SECURE_DEV_PKG ?= "" +TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or '${TI_K3_SECDEV_INSTALL_DIR}' }" export TI_SECURE_DEV_PKG SYSFW_SOC ?= "unknown" -SYSFW_CONFIG ?= "unknown" - -SYSFW_PREFIX = "ti-sci-firmware" -SYSFW_PREFIX_j7-evm-k3r5 = "ti-fs-firmware" -SYSFW_PREFIX_j7-hs-evm-k3r5 = "ti-fs-firmware" -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_am62xx-evm-k3r5 = "ti-fs-firmware" - SYSFW_SUFFIX ?= "unknown" +SYSFW_CONFIG ?= "unknown" -SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}" -SYSFW_BASE_append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}" - -SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin" +SYSFW_PREFIX = "sci" +SYSFW_PREFIX_j7-evm-k3r5 = "fs" +SYSFW_PREFIX_j7-hs-evm-k3r5 = "fs" +SYSFW_PREFIX_j7-hs-evm-k3r5-sr1-1 = "fs" +SYSFW_PREFIX_j7200-evm-k3r5 = "fs" +SYSFW_PREFIX_j7200-hs-evm-k3r5 = "fs" +SYSFW_PREFIX_j721s2-evm-k3r5-gp = "fs" +SYSFW_PREFIX_j721s2-evm-k3r5-sr1-hs-fs = "fs" +SYSFW_PREFIX_j721s2-hs-evm-k3r5 = "fs" +SYSFW_PREFIX_j784s4-evm-k3r5-gp = "fs" +SYSFW_PREFIX_j784s4-evm-k3r5-sr1-hs-fs = "fs" +SYSFW_PREFIX_j784s4-hs-evm-k3r5 = "fs" +SYSFW_PREFIX_am62xx-evm-k3r5-gp = "fs" +SYSFW_PREFIX_am62xx-evm-k3r5-hs-se = "fs" +SYSFW_PREFIX_am62xx-evm-k3r5-hs-fs = "fs" +SYSFW_PREFIX_am62xx-lp-evm-k3r5 = "fs" +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-se = "fs" +SYSFW_PREFIX_am62xx-lp-evm-k3r5-hs-fs = "fs" +SYSFW_PREFIX_am62axx-evm-k3r5-gp = "fs" +SYSFW_PREFIX_am62axx-evm-k3r5-hs-fs = "fs" +SYSFW_PREFIX_am62axx-evm-k3r5-hs-se = "fs" + +SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin" + +SYSFW_TIBOOT3 = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.bin" +SYSFW_TIBOOT3_SYMLINK ?= "tiboot3.bin" SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" -SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" +SYSFW_IMAGE = "sysfw-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.itb" SYSFW_SYMLINK ?= "sysfw.itb" +SYSFW_VBINARY_am65xx-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_VBINARY_am65xx-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_VBINARY_am65xx-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_VBINARY_am65xx-hs-evm-k3r5-sr2 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_VBINARY_j7-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_VBINARY_j7-hs-evm-k3r5 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_VBINARY_j7-hs-evm-k3r5-sr1-1 = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" + +SYSFW_IMAGE_am65xx-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_IMAGE_am65xx-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_IMAGE_am65xx-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_IMAGE_am65xx-hs-evm-k3r5-sr2 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_IMAGE_j7-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_IMAGE_j7-hs-evm-k3r5 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" +SYSFW_IMAGE_j7-hs-evm-k3r5-sr1-1 = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb" + CFLAGS[unexport] = "1" LDFLAGS[unexport] = "1" AS[unexport] = "1" @@ -52,20 +83,17 @@ LD[unexport] = "1" do_configure[noexec] = "1" EXTRA_OEMAKE = "\ - CROSS_COMPILE=${TARGET_PREFIX} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' SYSFW_HS_INNER_CERT_DL_URL='' \ - SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \ -" -EXTRA_OEMAKE_HS = " \ - HS=1 SW_REV=1 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \ + CROSS_COMPILE=${TARGET_PREFIX} SOC=${SYSFW_SOC} SOC_TYPE=${SYSFW_SUFFIX} \ + CONFIG=${SYSFW_CONFIG} SYSFW_DIR="${S}/ti-sysfw" \ + SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin" \ " -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_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"" +EXTRA_OEMAKE_remove_am65xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_am65xx-evm-k3r5-sr2 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_am65xx-hs-evm-k3r5-sr2 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_j7-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_j7-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" +EXTRA_OEMAKE_remove_j7-hs-evm-k3r5-sr1-1 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin"" do_compile() { cd ${WORKDIR}/imggen/ @@ -74,10 +102,20 @@ do_compile() { do_install() { install -d ${D}/boot - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY} - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK} + + if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then + install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${D}/boot/${SYSFW_VBINARY} + ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_IMAGE} + if [ ! -z "${SYSFW_SYMLINK}" ]; then + ln -sf ${SYSFW_VBINARY} ${D}/boot/${SYSFW_SYMLINK} + fi + fi + + if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then + install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3} + if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then + ln -sf ${SYSFW_TIBOOT3} ${D}/boot/${SYSFW_TIBOOT3_SYMLINK} + fi fi } @@ -87,105 +125,23 @@ inherit deploy do_deploy () { install -d ${DEPLOYDIR} - install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY} - rm -f ${DEPLOYDIR}/${SYSFW_IMAGE} - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} - if [ ! -z "${SYSFW_SYMLINK}" ]; then - rm -f ${DEPLOYDIR}/${SYSFW_SYMLINK} - ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} - fi - - install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ -} - -do_install_j7200-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_j7200-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_j7200-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_j7200-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_j721s2-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-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} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} -} -do_deploy_am64xx-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-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_am64xx-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_am62xx-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} -} + if [ -f "${WORKDIR}/imggen/${SYSFW_BINARY}" ]; then + install -m 644 ${WORKDIR}/imggen/${SYSFW_BINARY} ${DEPLOYDIR}/${SYSFW_VBINARY} + ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE} + if [ ! -z "${SYSFW_SYMLINK}" ]; then + ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ + fi + fi -do_deploy_am62xx-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}/ + if [ -f "${WORKDIR}/imggen/${SYSFW_TIBOOT3}" ]; then + install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3} + if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then + ln -sf ${SYSFW_TIBOOT3} ${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK} + install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/ + fi + fi } addtask deploy before do_build after do_compile diff --git a/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb index 642a8d3a..30b2e315 100644 --- a/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb +++ b/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "am62xx-evm" +COMPATIBLE_MACHINE = "am62xx|am62axx" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/traceframework/traceframework.inc b/recipes-bsp/traceframework/traceframework.inc index 33b87d9c..54b859ae 100644 --- a/recipes-bsp/traceframework/traceframework.inc +++ b/recipes-bsp/traceframework/traceframework.inc @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e8f6789acdcda76d02ed9203fc2e603d" COMPATIBLE_MACHINE = "tci6614-evm|keystone" PACKAGE_ARCH = "${MACHINE_ARCH}" -TRACEFRAMEWORK_GIT_URI = "git://git.ti.com/keystone-rtos/traceframework.git" -TRACEFRAMEWORK_GIT_PROTOCOL = "git" +TRACEFRAMEWORK_GIT_URI = "git://git.ti.com/git/keystone-rtos/traceframework.git" +TRACEFRAMEWORK_GIT_PROTOCOL = "https" TRACEFRAMEWORK_GIT_BRANCH = "master" TRACEFRAMEWORK_GIT_DESTSUFFIX = "git/ti/instrumentation/traceframework" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 68bfa899..70406724 100644 --- 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" +PV_k3 = "2.8+git${SRCPV}" 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 = "2fcd408bb3a6756767a43c073c597cef06e7f2d5" COMPATIBLE_MACHINE_k3 = "k3" TFA_BUILD_TARGET_k3 = "all" TFA_INSTALL_TARGET_k3 = "bl31" @@ -11,34 +9,65 @@ TFA_SPD_k3 = "opteed" EXTRA_OEMAKE_append_k3 = "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" EXTRA_OEMAKE_append_k3 = "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" -do_compile_append_am65xx-hs-evm() { +# Signing procedure for K3 HS devices +tfa_sign_k3hs() { 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; \ + if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ + else \ + echo "Warning: TI_SECURE_DEV_PKG not set, TF-A not signed."; \ + cp bl31.bin.unsigned bl31.bin; \ + fi; \ ) } -do_compile_append_am64xx-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; \ - ) +do_compile_append_am65xx-hs-evm() { + tfa_sign_k3hs +} + +do_compile_append_am64xx-evm() { + tfa_sign_k3hs +} + +do_compile_append_am62xx-evm() { + tfa_sign_k3hs +} + +do_compile_append_am62xx-lp-evm() { + tfa_sign_k3hs +} + +do_compile_append_am62axx-evm() { + tfa_sign_k3hs } do_compile_append_j7-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; \ - ) + tfa_sign_k3hs } do_compile_append_j7200-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; \ - ) + tfa_sign_k3hs +} + +do_compile_append_j721s2-hs-evm() { + tfa_sign_k3hs } + +do_compile_append_j784s4-hs-evm() { + tfa_sign_k3hs +} + +do_install_append_k3() { + if [ -f $BUILD_PLAT/bl31.bin.unsigned ]; then + echo "Install bl31.bin.unsigned" + install -m 0644 $BUILD_PLAT/bl31.bin.unsigned \ + ${D}/firmware/bl31.bin.unsigned + else + echo "Install bl31.bin.unsigned" + install -m 0644 $BUILD_PLAT/bl31.bin \ + ${D}/firmware/bl31.bin.unsigned + fi +} + diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb index b2982b04..7aad394e 100644 --- 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 = "r27" +PR = "r33" BRANCH = "ti-u-boot-2021.01" -SRCREV = "74fc69c8897f67628ee9517744c720a3dc201f53" +SRCREV = "3a5205e9803809f18edc59a40fd9df470f98a00f" diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index 903c61f0..7932e072 100644 --- 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" @@ -16,8 +16,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" BRANCH ?= "master" -UBOOT_GIT_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git" -UBOOT_GIT_PROTOCOL = "git" +UBOOT_GIT_URI = "git://git.ti.com/git/ti-u-boot/ti-u-boot.git" +UBOOT_GIT_PROTOCOL = "https" SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}" PV_append = "+git${SRCPV}" @@ -34,6 +34,8 @@ PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/pdk-i PACKAGECONFIG_append_aarch64 = " atf optee" PACKAGECONFIG_append_j7 = " dm" PACKAGECONFIG_append_am62xx = " dm" +PACKAGECONFIG_append_am62xx-lp-evm = " dm" +PACKAGECONFIG_append_am62axx = " dm" COMPATIBLE_MACHINE = "(ti-soc)" @@ -57,12 +59,6 @@ SPL_UART_BINARY = "u-boot-spl.bin" SPL_UART_BINARY_keystone = "" SPL_UART_BINARY_k3r5 = "" 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_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" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" @@ -112,6 +108,12 @@ UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND" UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}" UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}" +do_compile_append_k3r5 () { + if ! [ -f ${B}/${UBOOT_BINARY} ]; then + ln -s spl/${UBOOT_BINARY} ${B}/${UBOOT_BINARY} + fi +} + do_install_append () { if [ -n "${UBOOT_CONFIG}" ] then @@ -186,15 +188,15 @@ do_deploy_append () { then cd ${DEPLOYDIR} if [ "x${SPL_UART_BINARY}" != "x" ]; then - install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type} - rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type} - ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type} + rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type} + ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK} fi if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type} rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type} ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK} @@ -202,7 +204,7 @@ do_deploy_append () { ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type} rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type} ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK} @@ -210,7 +212,7 @@ do_deploy_append () { ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type} rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type} ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK} @@ -218,7 +220,7 @@ do_deploy_append () { ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY} fi if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then - install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type} + install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type} rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type} ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK} @@ -233,31 +235,31 @@ do_deploy_append () { else cd ${DEPLOYDIR} if [ "x${SPL_UART_BINARY}" != "x" ]; then - install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} - rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} - ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} - ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} + install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE} + rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK} + ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY} + ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK} fi if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then - install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE} + install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE} rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} fi if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then - install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE} + install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE} rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} fi if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then - install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE} + install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE} rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK} ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY} fi if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then - install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE} + install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE} rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK} ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} @@ -385,37 +387,4 @@ do_deploy_append_keystone () { fi } -# j7200 uses combined image for tiboot3.bin that includes u-boot-spl.bin and sysfw -# along with board PM/RM configs generated by k3-image-gen and comes from ti-sci-fw -# hence move the legacy u-boot's tiboot3.bin and u-boot-spl.bin out of the way -do_deploy_append_j7200-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_j7200-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_j721s2-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 -} - -do_deploy_append_am64xx-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_am62xx-evm-k3r5 () { - mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true - mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true -} - TOOLCHAIN = "gcc" diff --git a/recipes-bsp/uio-module-drv/uio-module-drv.inc b/recipes-bsp/uio-module-drv/uio-module-drv.inc index daae836f..43fedd04 100644 --- a/recipes-bsp/uio-module-drv/uio-module-drv.inc +++ b/recipes-bsp/uio-module-drv/uio-module-drv.inc @@ -7,8 +7,8 @@ UIO_MODULE_DRV_SRCREV = "78c535afe8f8cc0b715500a63eab0bc3606c0579" PV = "2.3.1.0+git${SRCPV}" -UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git" -UIO_MODULE_DRV_GIT_PROTOCOL = "git" +UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/git/keystone-linux/uio-module-drv.git" +UIO_MODULE_DRV_GIT_PROTOCOL = "https" SRC_URI = "${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${UIO_MODULE_DRV_SRCREV}" diff --git a/recipes-bsp/vpe-tests/vpe-tests_git.bb b/recipes-bsp/vpe-tests/vpe-tests_git.bb index 92c425b1..1e646688 100644 --- a/recipes-bsp/vpe-tests/vpe-tests_git.bb +++ b/recipes-bsp/vpe-tests/vpe-tests_git.bb @@ -14,7 +14,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRCREV = "e3d8db1aa935775f9d196ad7428e0cd9864a36ca" BRANCH ?= "master" -SRC_URI = "git://git.ti.com/vpe_tests/vpe_tests.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/vpe_tests/vpe_tests.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-bsp/vps-lld/vps-lld-rtos_git.bb b/recipes-bsp/vps-lld/vps-lld-rtos_git.bb index e2834a63..b4118cbd 100644 --- a/recipes-bsp/vps-lld/vps-lld-rtos_git.bb +++ b/recipes-bsp/vps-lld/vps-lld-rtos_git.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=1;endline=32;md5=4303d306ea53eb COMPATIBLE_MACHINE = "omap-a15" PACKAGE_ARCH = "${MACHINE_ARCH}" -VPS_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/vps.git" -VPS_LLD_GIT_PROTOCOL = "git" +VPS_LLD_GIT_URI = "git://git.ti.com/git/keystone-rtos/vps.git" +VPS_LLD_GIT_PROTOCOL = "https" VPS_LLD_GIT_BRANCH = "master" VPS_LLD_GIT_DESTSUFFIX = "git/ti/drv/vps" diff --git a/recipes-bsp/wdtimer/wdtimer-rtos_git.bb b/recipes-bsp/wdtimer/wdtimer-rtos_git.bb index 59ebf31f..43c4ffb0 100644 --- a/recipes-bsp/wdtimer/wdtimer-rtos_git.bb +++ b/recipes-bsp/wdtimer/wdtimer-rtos_git.bb @@ -8,8 +8,8 @@ inherit ti-pdk COMPATIBLE_MACHINE = "k2hk|k2e|k2l" PACKAGE_ARCH = "${MACHINE_ARCH}" -WATCHDOG_TIMER_GIT_URI = "git://git.ti.com/keystone-rtos/wdtimer.git" -WATCHDOG_TIMER_GIT_PROTOCOL = "git" +WATCHDOG_TIMER_GIT_URI = "git://git.ti.com/git/keystone-rtos/wdtimer.git" +WATCHDOG_TIMER_GIT_PROTOCOL = "https" WATCHDOG_TIMER_GIT_BRANCH = "master" WATCHDOG_TIMER_GIT_DESTSUFFIX = "git/ti/instrumentation/wdtimer" diff --git a/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb index 50b6c297..c769670f 100644 --- a/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb +++ b/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb @@ -3,7 +3,7 @@ LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e" SRC_URI = " \ - git://git.ti.com/wilink8-wlan/wl18xx_fw.git;protocol=git;branch=${BRANCH} \ + git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH} \ file://0001-Add-Makefile-to-install-firmware-files.patch \ " diff --git a/recipes-bsp/x-load/x-load_1.46-psp.bb b/recipes-bsp/x-load/x-load_1.46-psp.bb index 108e408d..5713927b 100644 --- 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" diff --git a/recipes-connectivity/uim/uim-sysfs_8.5.bb b/recipes-connectivity/uim/uim-sysfs_8.5.bb index 72e2166f..b39d3970 100644 --- a/recipes-connectivity/uim/uim-sysfs_8.5.bb +++ b/recipes-connectivity/uim/uim-sysfs_8.5.bb @@ -8,7 +8,7 @@ INITSCRIPT_PARAMS = "defaults 03" inherit update-rc.d SRCREV = "a75f45be2d5c74fc1dd913d08afc30f09a230aa9" -SRC_URI = "git://git.ti.com/ti-bt/uim.git" +SRC_URI = "git://git.ti.com/git/ti-bt/uim.git;protocol=https" S = "${WORKDIR}/git" diff --git a/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb b/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb index 8a759ed8..589fb709 100644 --- a/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb +++ b/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb @@ -7,7 +7,7 @@ RDEPENDS_${PN} = "wl18xx-fw" #Tag: R8.7_SP3 (8.7.3) SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" -SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git" +SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;protocol=https" S = "${WORKDIR}/git" diff --git a/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb b/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb index 6c4b2b43..b59810fe 100644 --- a/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb +++ b/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.7.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c # Tag: R8.7_SP3 (8.7.3) SRCREV = "a07b6e711d2a70608101d3d6cdc5749c4d8a96d5" BRANCH = "sitara-scripts" -SRC_URI = "git://git.ti.com/wilink8-wlan/wl18xx-target-scripts.git;protocol=git;branch=${BRANCH} \ +SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx-target-scripts.git;protocol=https;branch=${BRANCH} \ file://0001-print_stat.sh-replace-system-bin-sh-with-bin-sh.patch \ " diff --git a/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/recipes-connectivity/wlconf/wlconf_8.7.3.bb index 19f28b75..d9c0b6c7 100644 --- a/recipes-connectivity/wlconf/wlconf_8.7.3.bb +++ b/recipes-connectivity/wlconf/wlconf_8.7.3.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85 # Tag: R8.7_SP3 (8.7.3) SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" -SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git" +SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;protocol=https" S = "${WORKDIR}/git/wlconf" diff --git a/recipes-devtools/gdbc6x/gdbc6x.inc b/recipes-devtools/gdbc6x/gdbc6x.inc index eeb18fb1..54115f4e 100644 --- a/recipes-devtools/gdbc6x/gdbc6x.inc +++ b/recipes-devtools/gdbc6x/gdbc6x.inc @@ -4,6 +4,6 @@ SRCREV = "dd0c82fb5763a6b32dc6d68e561efb66ab8283d7" PV = "1.1.0" INC_PR = "r7" -SRC_URI = "git://git.ti.com/sdo-emu/gdbc6x.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/sdo-emu/gdbc6x.git;protocol=https;branch=${BRANCH}" BRANCH = "master" diff --git a/recipes-devtools/k3conf/k3conf_git.bb b/recipes-devtools/k3conf/k3conf_git.bb index 3f542da4..55532365 100644 --- a/recipes-devtools/k3conf/k3conf_git.bb +++ b/recipes-devtools/k3conf/k3conf_git.bb @@ -8,9 +8,9 @@ PV = "0.2+git${SRCPV}" COMPATIBLE_MACHINE = "k3" BRANCH ?= "master" -SRCREV = "966a5695b73bc53039ca60d196b77de0640088d4" +SRCREV = "1dd468d551fd786c410e88dadc1114505d057ebe" -SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" diff --git a/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb index 55758682..dcdb1209 100644 --- a/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +++ b/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb @@ -13,7 +13,7 @@ CLEANBROKEN = "1" BRANCH = "ti-${PV}" -SRC_URI = "git://git.ti.com/graphics/ti-gc320-libs.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-libs.git;protocol=https;branch=${BRANCH}" SRCREV = "c0afab259de59909cfe74c01f3f7fbaa147f94b5" RRECOMMENDS_${PN} = "ti-gc320-driver" diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 1bfb2b93..a0a10acd 100644 --- 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,18 +8,21 @@ 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|j784s4-evm|j784s4-hs-evm|am62xx" PR = "r2" BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" -SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" -SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed" +SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" +SRCREV = "5977e82b96028f783d39c7219f016c1faf8dc5f5" 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_j784s4-evm = "j784s4_linux" +TARGET_PRODUCT_j784s4-hs-evm = "j784s4_linux" TARGET_PRODUCT_am62xx = "am62_linux" PVR_BUILD ?= "release" PVR_WS = "wayland" diff --git a/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index 319f226f..59bac2f4 100644 --- a/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -14,7 +14,7 @@ PR = "r37" BRANCH = "ti-img-sgx/dunfell/${PV}" -SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git;protocol=https;branch=${BRANCH}" SRCREV = "742cf38aba13e1ba1a910cf1f036a1a212c263b6" TARGET_PRODUCT_omap-a15 = "jacinto6evm" diff --git a/recipes-kernel/linux/kernel-rdepends.inc b/recipes-kernel/linux/kernel-rdepends.inc index 17aee4c2..86d678ee 100644 --- a/recipes-kernel/linux/kernel-rdepends.inc +++ b/recipes-kernel/linux/kernel-rdepends.inc @@ -35,17 +35,28 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw pruhsr-fw pruprp RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw pruhsr-fw pruprp-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2 prusw-fw-am65x-sr2" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx-evm = " prueth-fw-am65x-sr2" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am64xx = " prueth-fw-am65x-sr2" # Add run-time dependency for Cadence MHDP firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " cadence-mhdp-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-hs-evm = " cadence-mhdp-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-evm = " cadence-mhdp-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j721s2-hs-evm = " cadence-mhdp-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-evm = " cadence-mhdp-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-hs-evm = " cadence-mhdp-fw" # Add run-time dependency for Video Decoding firmware to the rootfs 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" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-evm = " cnm-wave-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j784s4-hs-evm = " cnm-wave-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62axx = " cnm-wave-fw" # Add run-time dependency for TIFS Low Power Module stub RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-evm = " tifs-lpm-stub" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62xx-lp-evm = " tifs-lpm-stub" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am62axx = " tifs-lpm-stub" diff --git a/recipes-kernel/linux/linux-ti-mainline_git.bb b/recipes-kernel/linux/linux-ti-mainline_git.bb index 4a5034fd..e8e5cd03 100644 --- a/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -DEFCONFIG_BUILDER = "${WORKDIR}/ti-upstream-tools/config/defconfig_builder.sh" +DEFCONFIG_BUILDER = "${S}/ti-upstream-tools/config/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc @@ -29,10 +29,10 @@ MACHINE_KERNEL_PR_append = "b" PR = "${MACHINE_KERNEL_PR}" KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" -KERNEL_GIT_PROTOCOL = "git" +KERNEL_GIT_PROTOCOL = "https" SRC_URI += " \ ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ - git://git.ti.com/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ + git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools \ file://defconfig \ " @@ -43,7 +43,7 @@ KERNEL_DEVICETREE = "" kernel_do_compile_append() { oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} - oe_runmake -C ${WORKDIR}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} + oe_runmake -C ${S}/ti-upstream-tools LINUX=${S} DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} } do_install_append() { diff --git a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb index c19f9054..75c17e98 100644 --- 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 = "d9ee8a25c2eea0d2aff22f36ced2513538fbd1a2" -PV = "5.10.109+git${SRCPV}" +SRCREV = "e6bb059e69c106b73bfe2a10e729dbe5a5820916" +PV = "5.10.168+git${SRCPV}" diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb index ef0b77d5..3141b093 100644 --- a/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -25,15 +25,15 @@ S = "${WORKDIR}/git" BRANCH = "ti-linux-5.10.y" -SRCREV = "9e58028f945f077b3e0d7423c6af8938ec46a80a" -PV = "5.10.109+git${SRCPV}" +SRCREV = "991c5ce91e43cb620f534dc9fe7b0ad21f4f4388" +PV = "5.10.168+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR_append = "b" PR = "${MACHINE_KERNEL_PR}" -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "git" +KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" +KERNEL_GIT_PROTOCOL = "https" SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ file://defconfig" @@ -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" diff --git a/recipes-kernel/linux/linux-ti-staging_5.4.bb b/recipes-kernel/linux/linux-ti-staging_5.4.bb index a86223af..3a5516c6 100644 --- a/recipes-kernel/linux/linux-ti-staging_5.4.bb +++ b/recipes-kernel/linux/linux-ti-staging_5.4.bb @@ -28,8 +28,8 @@ PV = "5.4.106+git${SRCPV}" MACHINE_KERNEL_PR_append = "a" PR = "${MACHINE_KERNEL_PR}" -KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git" -KERNEL_GIT_PROTOCOL = "git" +KERNEL_GIT_URI = "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" +KERNEL_GIT_PROTOCOL = "https" SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ file://defconfig" diff --git a/recipes-kernel/linux/setup-defconfig.inc b/recipes-kernel/linux/setup-defconfig.inc index 1e97acc0..df7d9ac8 100644 --- 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 diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend new file mode 100644 index 00000000..89983f2b --- /dev/null +++ b/recipes-security/optee/optee-client_%.bbappend @@ -0,0 +1,7 @@ +PV_ti-soc = "3.20.0+git${SRCPV}" +SRCREV_ti-soc = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc" + +inherit pkgconfig +DEPENDS_append_ti-soc = "util-linux" + +EXTRA_OEMAKE_append_ti-soc = " PKG_CONFIG=pkg-config" diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend new file mode 100644 index 00000000..ef6da34e --- /dev/null +++ b/recipes-security/optee/optee-examples_%.bbappend @@ -0,0 +1,5 @@ +PV_ti-soc = "3.20.0+git${SRCPV}" +SRCREV_ti-soc = "a98d01e1b9168eaed96bcd0bac0df67c44a81081" +SRC_URI_ti-soc = "git://github.com/linaro-swg/optee_examples.git;protocol=https" + +DEPENDS_append_ti-soc = " python3-cryptography-native" diff --git 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 index 17005396..1698c904 100644 --- 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 @@ -18,17 +18,17 @@ 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) - + -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) + -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) + -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) - + -print-file-name=libgcc_eh.a 2> /dev/null) + # Define these to something to discover accidental use diff --git 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 deleted file mode 100644 index 5c0d0a56..00000000 --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +++ /dev/null @@ -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 diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 4e01ea74..ebcf584d 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -1,17 +1,19 @@ FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" -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 \ +PV_ti-soc = "3.20.0+git${SRCPV}" +SRCREV_ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https \ +file://0006-allow-setting-sysroot-for-libgcc-lookup.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 CFG_TEE_CORE_LOG_LEVEL=1" +EXTRA_OEMAKE_append_am62xx-lp-evm = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" +EXTRA_OEMAKE_append_am62axx-evm = " CFG_TEE_CORE_LOG_LEVEL=1" + do_compile_prepend_ti-soc() { export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} } @@ -19,6 +21,7 @@ do_compile_prepend_ti-soc() { do_compile_append_k3() { ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \ cp tee-pager_v2.bin ${B}/bl32.bin; \ + cp tee-pager_v2.bin ${B}/bl32.bin.unsigned; \ cp tee.elf ${B}/bl32.elf; \ ) } @@ -45,8 +48,14 @@ optee_sign_legacyhs() { # Signing procedure for K3 HS devices optee_sign_k3hs() { ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \ + if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \ + else \ + echo "Warning: TI_SECURE_DEV_PKG not set, OP-TEE not signed."; \ + cp tee-pager_v2.bin tee-pager.bin.signed; \ + fi; \ mv tee-pager.bin.signed ${B}/bl32.bin; \ + cp tee-pager_v2.bin bl32.bin.unsigned; \ cp tee.elf ${B}/bl32.elf; \ ) } @@ -63,7 +72,19 @@ do_compile_append_am65xx-hs-evm() { optee_sign_k3hs } -do_compile_append_am64xx-hs-evm() { +do_compile_append_am64xx-evm() { + optee_sign_k3hs +} + +do_compile_append_am62xx-evm() { + optee_sign_k3hs +} + +do_compile_append_am62xx-lp-evm() { + optee_sign_k3hs +} + +do_compile_append_am62axx-evm() { optee_sign_k3hs } @@ -75,9 +96,18 @@ do_compile_append_j7200-hs-evm() { optee_sign_k3hs } +do_compile_append_j721s2-hs-evm() { + optee_sign_k3hs +} + +do_compile_append_j784s4-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 + install -m 644 ${B}/bl32.bin.unsigned ${D}${nonarch_base_libdir}/firmware/ || true install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true } @@ -98,6 +128,7 @@ do_deploy_append_dra7xx() { do_deploy_append_k3() { ln -sf optee/bl32.bin ${DEPLOYDIR}/ + ln -sf optee/bl32.bin.unsigned ${DEPLOYDIR}/ ln -sf optee/bl32.elf ${DEPLOYDIR}/ } diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend new file mode 100644 index 00000000..79b4b4d6 --- /dev/null +++ b/recipes-security/optee/optee-test_%.bbappend @@ -0,0 +1,5 @@ +PV_ti-soc = "3.19.0+git${SRCPV}" +SRCREV_ti-soc = "ab9863cc187724e54c032b738c28bd6e9460a4db" +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" + +DEPENDS_append_ti-soc = " python3-cryptography-native" diff --git a/recipes-ti/ctoolslib/libaet_git.bb b/recipes-ti/ctoolslib/libaet_git.bb index 626ba926..27ea8ac9 100644 --- a/recipes-ti/ctoolslib/libaet_git.bb +++ b/recipes-ti/ctoolslib/libaet_git.bb @@ -7,7 +7,7 @@ PV = "4.19.0.0" LIC_FILES_CHKSUM = "file://../ctoolslib_manifest.html;md5=b7dd369a2e07ef9a71795ee5a9bd01bd" -SRC_URI = "git://git.ti.com/sdo-emu/ctoolslib.git;protocol=git;branch=opencl_aetlib_build" +SRC_URI = "git://git.ti.com/git/sdo-emu/ctoolslib.git;protocol=https;branch=opencl_aetlib_build" SRCREV = "de7954abab0f0caa8a2c7b53095c30226d901a31" DEPENDS = "ti-cgt6x-native" diff --git a/recipes-ti/dsplib/dsplib.inc b/recipes-ti/dsplib/dsplib.inc index 111d83cb..81534c59 100644 --- a/recipes-ti/dsplib/dsplib.inc +++ b/recipes-ti/dsplib/dsplib.inc @@ -17,8 +17,8 @@ DEPENDS = "ti-cgt6x-native \ S = "${WORKDIR}/git" DSPLIB_GIT_BRANCH = "master" -DSPLIB_GIT_PROTOCOL = "git" -DSPLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/dsplib.git" +DSPLIB_GIT_PROTOCOL = "https" +DSPLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/dsplib.git" DSPLIB_SRCREV = "0390b171042c602e07669fd28a371cc319b90161" SRC_URI = "${DSPLIB_GIT_URI};protocol=${DSPLIB_GIT_PROTOCOL};branch=${DSPLIB_GIT_BRANCH}" diff --git a/recipes-ti/includes/ti-paths.inc b/recipes-ti/includes/ti-paths.inc index 52a93cf5..44731a4e 100644 --- a/recipes-ti/includes/ti-paths.inc +++ b/recipes-ti/includes/ti-paths.inc @@ -61,6 +61,7 @@ export TI_CGT6X_7_INSTALL_DIR_RECIPE = "${installdir}/cgt6x-7" export GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE = "${installdir}/gcc-linaro-baremetal" export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE = "${installdir}/gcc-linaro-baremetal-aarch64" export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" +export TI_K3_SECDEV_INSTALL_DIR_RECIPE = "${installdir}/ti-k3-secdev" # This is where the tools will end up in sysroot @@ -116,6 +117,7 @@ export TI_CGT6X_7_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT6X_7_INSTALL_DIR export GCC_LINARO_BAREMETAL_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}" export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN = "${STAGING_DIR_NATIVE}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}" export TI_CGT7X_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_CGT7X_INSTALL_DIR_RECIPE}" +export TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" DSPSUFFIX_omapl137 = "x674" diff --git a/recipes-ti/ipc/ipc-transport.inc b/recipes-ti/ipc/ipc-transport.inc index 0c1edef1..ec093560 100644 --- a/recipes-ti/ipc/ipc-transport.inc +++ b/recipes-ti/ipc/ipc-transport.inc @@ -1,7 +1,7 @@ LICENSE = "BSD-3-Clause" -IPC_TRANSPORT_GIT_URI = "git://git.ti.com/keystone-linux/ipc-transport.git" -IPC_TRANSPORT_GIT_PROTOCOL = "git" +IPC_TRANSPORT_GIT_URI = "git://git.ti.com/git/keystone-linux/ipc-transport.git" +IPC_TRANSPORT_GIT_PROTOCOL = "https" IPC_TRANSPORT_GIT_BRANCH = "master" # Below commit ID corresponds to "DEV.IPC-TRANSPORT.02.00.00.02A" diff --git a/recipes-ti/ipc/ti-ipc-rtos.inc b/recipes-ti/ipc/ti-ipc-rtos.inc index b6b7892f..6f0f4146 100644 --- a/recipes-ti/ipc/ti-ipc-rtos.inc +++ b/recipes-ti/ipc/ti-ipc-rtos.inc @@ -1,8 +1,8 @@ require recipes-ti/includes/ti-paths.inc -TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/ipc/ipc-examples.git" +TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/git/ipc/ipc-examples.git" TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples" -TI_IPC_EXAMPLES_GIT_PROTOCOL = "git" +TI_IPC_EXAMPLES_GIT_PROTOCOL = "https" TI_IPC_EXAMPLES_GIT_BRANCH = "master" TI_IPC_EXAMPLES_NAME = "ipc-examples" @@ -12,9 +12,9 @@ protocol=${TI_IPC_EXAMPLES_GIT_PROTOCOL};\ branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\ name=${TI_IPC_EXAMPLES_NAME}" -TI_IPC_METADATA_GIT_URI = "git://git.ti.com/ipc/ipc-metadata.git" +TI_IPC_METADATA_GIT_URI = "git://git.ti.com/git/ipc/ipc-metadata.git" TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata" -TI_IPC_METADATA_GIT_PROTOCOL = "git" +TI_IPC_METADATA_GIT_PROTOCOL = "https" TI_IPC_METADATA_GIT_BRANCH = "master" TI_IPC_METADATA_NAME = "ipc-metadata" diff --git a/recipes-ti/ipc/ti-ipc.inc b/recipes-ti/ipc/ti-ipc.inc index 3b0115eb..d8ae6f84 100644 --- a/recipes-ti/ipc/ti-ipc.inc +++ b/recipes-ti/ipc/ti-ipc.inc @@ -4,8 +4,8 @@ HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255" -TI_IPC_GIT_URI = "git://git.ti.com/ipc/ipcdev.git" -TI_IPC_GIT_PROTOCOL = "git" +TI_IPC_GIT_URI = "git://git.ti.com/git/ipc/ipcdev.git" +TI_IPC_GIT_PROTOCOL = "https" TI_IPC_GIT_BRANCH = "master" #Corresponds to 3.51.00.00A diff --git a/recipes-ti/ipc/ti-rpmsg-char.inc b/recipes-ti/ipc/ti-rpmsg-char.inc index b499647a..2c6ab414 100644 --- a/recipes-ti/ipc/ti-rpmsg-char.inc +++ b/recipes-ti/ipc/ti-rpmsg-char.inc @@ -3,14 +3,14 @@ SUMMARY = "TI RPMsg Char Utility Library" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/src/rpmsg_char.c;beginline=1;endline=31;md5=71987db43a2159cff5ea00505c6fce58" -PROTOCOL = "git" +PROTOCOL = "https" BRANCH = "master" -SRC_URI = "git://git.ti.com/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" +SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" -# Initial 0.4.1 release -SRCREV = "355d2b0bcde5eb5c895a270d1835102d2bc39fbd" +# Initial 0.5.2 release +SRCREV = "1da3e1bd0412c148ab57690940fea5d129220896" -PV = "0.4.1+git${SRCPV}" +PV = "0.5.2+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-ti/mathlib/mathlib.inc b/recipes-ti/mathlib/mathlib.inc index cfc5409f..5d96e8aa 100644 --- a/recipes-ti/mathlib/mathlib.inc +++ b/recipes-ti/mathlib/mathlib.inc @@ -17,8 +17,8 @@ DEPENDS = "ti-cgt6x-native \ S = "${WORKDIR}/git" MATHLIB_GIT_BRANCH = "master" -MATHLIB_GIT_PROTOCOL = "git" -MATHLIB_GIT_URI = "git://git.ti.com/ep-processor-libraries/mathlib.git" +MATHLIB_GIT_PROTOCOL = "https" +MATHLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/mathlib.git" MATHLIB_SRCREV = "eadcc9547faf69789661b004bb0b5ef53bb69951" SRC_URI = "${MATHLIB_GIT_URI};protocol=${MATHLIB_GIT_PROTOCOL};branch=${MATHLIB_GIT_BRANCH}" diff --git a/recipes-ti/mpm-transport/mpm-transport_git.bb b/recipes-ti/mpm-transport/mpm-transport_git.bb index 3c28f28c..bdbd4b04 100644 --- a/recipes-ti/mpm-transport/mpm-transport_git.bb +++ b/recipes-ti/mpm-transport/mpm-transport_git.bb @@ -10,7 +10,7 @@ DEPENDS_append_k2e = " hyplnk-lld" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI = "git://git.ti.com/keystone-linux/mpm-transport.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/keystone-linux/mpm-transport.git;protocol=https;branch=${BRANCH}" BRANCH = "master" # This commit corresponds to tag DEV.MPM-TRANSPORT-02.00.04.00 diff --git a/recipes-ti/multiprocmgr/multiprocmgr.inc b/recipes-ti/multiprocmgr/multiprocmgr.inc index 64fb6f6f..a019496a 100644 --- a/recipes-ti/multiprocmgr/multiprocmgr.inc +++ b/recipes-ti/multiprocmgr/multiprocmgr.inc @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce208c498eb9669223724dc9c1d8fe4" SECTION = "console" COMPATIBLE_MACHINE = "keystone" -MULTIPROCMGR_GIT_URI = "git://git.ti.com/keystone-linux/multi-proc-manager.git" -MULTIPROCMGR_GIT_PROTOCOL = "git" +MULTIPROCMGR_GIT_URI = "git://git.ti.com/git/keystone-linux/multi-proc-manager.git" +MULTIPROCMGR_GIT_PROTOCOL = "https" MULTIPROCMGR_GIT_BRANCH = "master" # The following commits correspond to DEV.MPM-3.00.05.00 diff --git a/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/recipes-ti/openmp-rtos/openmp-rtos_git.bb index 0c93f354..a578b0b7 100644 --- a/recipes-ti/openmp-rtos/openmp-rtos_git.bb +++ b/recipes-ti/openmp-rtos/openmp-rtos_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "TI OpenMP RTOS" -HOMEPAGE = "git://git.ti.com/openmp/ti-openmp-dsp-runtime.git" +HOMEPAGE = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git" LICENSE = "BSD" require recipes-ti/includes/ti-paths.inc @@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "openmp" PV = "2_06_03_00" PR = "r0" -OPENMP_RTOS_GIT_URI = "git://git.ti.com/openmp/ti-openmp-dsp-runtime.git" -OPENMP_RTOS_GIT_PROTOCOL = "git" +OPENMP_RTOS_GIT_URI = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git" +OPENMP_RTOS_GIT_PROTOCOL = "https" OPENMP_RTOS_GIT_BRANCH = "master" BRANCH = "${OPENMP_RTOS_GIT_BRANCH}" diff --git a/recipes-ti/secdev/ti-k3-secdev_git.bb b/recipes-ti/secdev/ti-k3-secdev_git.bb new file mode 100644 index 00000000..7d9a4406 --- /dev/null +++ b/recipes-ti/secdev/ti-k3-secdev_git.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Security development tools for High-Security(HS) TI K3 processors." +HOMEPAGE = "https://git.ti.com/cgit/security-development-tools/core-secdev-k3" +SECTION = "devel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://manifest/k3-secdev-0.2-manifest.html;md5=f632a78870cc64550078d7b3cbac0892" + +require recipes-ti/includes/ti-paths.inc + +# Native host tool only +COMPATIBLE_MACHINE = "null" +COMPATIBLE_MACHINE_class-native = "(.*)" +COMPATIBLE_MACHINE_class-nativesdk = "(.*)" + +GIT_URI = "git://git.ti.com/git/security-development-tools/core-secdev-k3.git" +GIT_PROTOCOL = "https" +GIT_BRANCH = "master" +GIT_SRCREV = "bba9cabaeee96f7f287385188ff289b46769a4bf" + +SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}" +SRCREV = "${GIT_SRCREV}" + +S = "${WORKDIR}/git" + +do_install() { + CP_ARGS="-Prf --preserve=mode,links,timestamps --no-preserve=ownership" + install -d ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE} + cp ${CP_ARGS} ${S}/* ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE} +} + +FILES_${PN} += "${TI_K3_SECDEV_INSTALL_DIR_RECIPE}" + +INSANE_SKIP_${PN} = "arch ldflags file-rdeps" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-ti/swtools/swtools_git.bb b/recipes-ti/swtools/swtools_git.bb index 497c0e0d..6a3b0344 100644 --- a/recipes-ti/swtools/swtools_git.bb +++ b/recipes-ti/swtools/swtools_git.bb @@ -15,8 +15,8 @@ PR = "r3" S = "${WORKDIR}/git" SWTOOLS_GIT_BRANCH = "master" -SWTOOLS_GIT_PROTOCOL = "git" -SWTOOLS_GIT_URI = "git://git.ti.com/ep-processor-libraries/swtools.git" +SWTOOLS_GIT_PROTOCOL = "https" +SWTOOLS_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/swtools.git" SWTOOLS_SRCREV = "7d1c85e686b1466cd2d535fc9cac5baf1aae24a4" SRC_URI = "${SWTOOLS_GIT_URI};protocol=${SWTOOLS_GIT_PROTOCOL};branch=${SWTOOLS_GIT_BRANCH}" diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb index 0f2ba9af..b161d345 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb @@ -14,12 +14,18 @@ inherit update-alternatives PLAT_SFX = "" PLAT_SFX_j7 = "j721e" +PLAT_SFX_j7-hs-evm = "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_j784s4-evm = "j784s4" +PLAT_SFX_j784s4-hs-evm = "j784s4" PLAT_SFX_am65xx = "am65xx" PLAT_SFX_am64xx = "am64xx" PLAT_SFX_am62xx = "am62xx" +PLAT_SFX_am62xx-lp-evm = "am62xx" +PLAT_SFX_am62axx = "am62axx" FILESEXTRAPATHS_prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" require recipes-bsp/ti-linux-fw/ti-linux-fw.inc @@ -30,12 +36,15 @@ PV = "${CORESDK_RTOS_VERSION}" CLEANBROKEN = "1" PR = "${INC_PR}.0" -# Secure Build +# Secure Build +include recipes-ti/includes/ti-paths.inc DEPENDS += "openssl-native" FILES_${PN} += "${base_libdir}" -TI_SECURE_DEV_PKG ?= "" +DEPENDS_append = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }" +TI_SECURE_DEV_PKG = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }" +export TI_SECURE_DEV_PKG RTOS_ETH_FW_DIR = "${S}/ti-eth/${PLAT_SFX}" RTOS_DM_FW_DIR = "${S}/ti-dm/${PLAT_SFX}" @@ -51,20 +60,106 @@ DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" # J7 HS support do_install_prepend_j7-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}; \ ) + ( + cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_0_release_strip.xer5f \ + ipc_echo_test_mcu2_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_1_release_strip.xer5f \ + ipc_echo_test_mcu2_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_0_release_strip.xer5f \ + ipc_echo_test_mcu3_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_1_release_strip.xer5f \ + ipc_echo_test_mcu3_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c66xdsp_1_release_strip.xe66 \ + ipc_echo_test_c66xdsp_1_release_strip.xe66.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c66xdsp_2_release_strip.xe66 \ + ipc_echo_test_c66xdsp_2_release_strip.xe66.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \ + ipc_echo_test_c7x_1_release_strip.xe71.signed; \ + ) + ( + cd ${RTOS_ETH_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh app_remoteswitchcfg_server_strip.xer5f \ + app_remoteswitchcfg_server_strip.xer5f.signed; + ) } # J7 HS support do_install_prepend_j7200-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}; \ ) + ( + cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_0_release_strip.xer5f \ + ipc_echo_test_mcu2_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_1_release_strip.xer5f \ + ipc_echo_test_mcu2_1_release_strip.xer5f.signed; \ + ) + ( + cd ${RTOS_ETH_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh app_remoteswitchcfg_server_strip.xer5f \ + app_remoteswitchcfg_server_strip.xer5f.signed; + ) +} + +# J7 HS support +do_install_prepend_j721s2-hs-evm() { + ( 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}; \ + ) + ( + cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_0_release_strip.xer5f \ + ipc_echo_test_mcu2_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_1_release_strip.xer5f \ + ipc_echo_test_mcu2_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_0_release_strip.xer5f \ + ipc_echo_test_mcu3_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_1_release_strip.xer5f \ + ipc_echo_test_mcu3_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \ + ipc_echo_test_c7x_1_release_strip.xe71.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_2_release_strip.xe71 \ + ipc_echo_test_c7x_2_release_strip.xe71.signed; \ + ) +} + +# J784S4 support +do_install_prepend_j784s4-hs-evm() { + ( 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}; \ + ) + ( + cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_0_release_strip.xer5f \ + ipc_echo_test_mcu2_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu2_1_release_strip.xer5f \ + ipc_echo_test_mcu2_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_0_release_strip.xer5f \ + ipc_echo_test_mcu3_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu3_1_release_strip.xer5f \ + ipc_echo_test_mcu3_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu4_0_release_strip.xer5f \ + ipc_echo_test_mcu4_0_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_mcu4_1_release_strip.xer5f \ + ipc_echo_test_mcu4_1_release_strip.xer5f.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \ + ipc_echo_test_c7x_1_release_strip.xe71.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_2_release_strip.xe71 \ + ipc_echo_test_c7x_2_release_strip.xe71.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_3_release_strip.xe71 \ + ipc_echo_test_c7x_3_release_strip.xe71.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_4_release_strip.xe71 \ + ipc_echo_test_c7x_4_release_strip.xe71.signed; \ + ) } # Update the am64xx ipc binaries to be consistent with other platforms @@ -78,10 +173,30 @@ do_install_prepend_am64xx() { ) } -# Update the am62xx ipc binaries to be consistent with other platforms +# AM62Q HS-SE support do_install_prepend_am62xx() { + ( 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}; \ + ) ( cd ${RTOS_IPC_FW_DIR}; \ mv am62-mcu-m4f0_0-fw ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f \ + ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f.signed; \ + ) +} + +do_install_prepend_am62axx-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}; \ + ) + ( cd ${RTOS_IPC_FW_DIR}; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh am62a-mcu-r5f0_0-fw \ + am62a-mcu-r5f0_0-fw.signed; \ + ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ipc_echo_test_c7x_1_release_strip.xe71 \ + ipc_echo_test_c7x_1_release_strip.xe71.signed; \ ) } @@ -107,6 +222,18 @@ do_install_j7() { install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR} } +do_install_append_j7-hs-evm() { + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c66xdsp_1_release_strip.xe66.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c66xdsp_2_release_strip.xe66.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} + # ETH firmware + install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f.signed ${LEGACY_ETH_FW_DIR} +} + do_install_j7200-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} @@ -124,11 +251,16 @@ do_install_j7200-hs-evm() { 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} + # Signed Firmwares + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f.signed ${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} + # ETH Signed firmware + install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f.signed ${LEGACY_ETH_FW_DIR} } do_install_j721s2-evm() { @@ -147,6 +279,80 @@ 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} + # Signed firmware + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71.signed ${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_j784s4-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_mcu4_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu4_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} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_3_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_4_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + # Signed firmware + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu4_0_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu4_1_release_strip.xer5f.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_3_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_4_release_strip.xe71.signed ${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_j784s4-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_mcu4_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu4_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} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_3_release_strip.xe71 ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_4_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} @@ -165,10 +371,21 @@ do_install_am64xx() { do_install_am62xx() { install -d ${LEGACY_IPC_FW_DIR} install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR} + # Signed Firmware + install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f.signed ${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} + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR} } +do_install_am62axx() { + install -d ${LEGACY_IPC_FW_DIR} + # DM+IPC Firmware + install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_IPC_FW_DIR}/am62a-mcu-r5f0_0-fw.signed ${LEGACY_IPC_FW_DIR} + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_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_1_release_strip.xe71.signed ${LEGACY_IPC_FW_DIR} +} do_deploy() { install -d ${DEPLOYDIR} @@ -179,6 +396,11 @@ do_deploy_am62xx() { install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${DEPLOYDIR} } +do_deploy_am62axx() { + install -d ${DEPLOYDIR} + install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${DEPLOYDIR} +} + # Set up names for the firmwares ALTERNATIVE_${PN}_am65xx = "\ am65x-mcu-r5f0_0-fw \ @@ -197,6 +419,35 @@ ALTERNATIVE_${PN}_am62xx = "\ am62-main-r5f0_0-fw \ " +ALTERNATIVE_${PN}_am62xx-lp-evm = "\ + am62-mcu-m4f0_0-fw \ + am62-main-r5f0_0-fw \ + " + +ALTERNATIVE_${PN}_am62axx = "\ + am62a-mcu-r5f0_0-fw \ + am62a-c71_0-fw \ + " + +ALTERNATIVE_${PN}_j7-hs-evm = "\ + j7-mcu-r5f0_0-fw \ + j7-mcu-r5f0_1-fw \ + j7-main-r5f0_0-fw \ + j7-main-r5f0_1-fw \ + j7-main-r5f1_0-fw \ + j7-main-r5f1_1-fw \ + j7-c66_0-fw \ + j7-c66_1-fw \ + j7-c71_0-fw\ + j7-main-r5f0_0-fw-sec \ + j7-main-r5f0_1-fw-sec \ + j7-main-r5f1_0-fw-sec \ + j7-main-r5f1_1-fw-sec \ + j7-c66_0-fw-sec \ + j7-c66_1-fw-sec \ + j7-c71_0-fw-sec \ + " + ALTERNATIVE_${PN}_j7 = "\ j7-mcu-r5f0_0-fw \ j7-mcu-r5f0_1-fw \ @@ -221,6 +472,8 @@ ALTERNATIVE_${PN}_j7200-hs-evm = "\ j7200-mcu-r5f0_1-fw \ j7200-main-r5f0_0-fw \ j7200-main-r5f0_1-fw \ + j7200-main-r5f0_0-fw-sec \ + j7200-main-r5f0_1-fw-sec \ " ALTERNATIVE_${PN}_j721s2-evm = "\ @@ -234,6 +487,66 @@ 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 \ + j721s2-main-r5f0_0-fw-sec \ + j721s2-main-r5f0_1-fw-sec \ + j721s2-main-r5f1_0-fw-sec \ + j721s2-main-r5f1_1-fw-sec \ + j721s2-c71_0-fw-sec \ + j721s2-c71_1-fw-sec \ + " + +ALTERNATIVE_${PN}_j784s4-evm = "\ + j784s4-mcu-r5f0_0-fw \ + j784s4-mcu-r5f0_1-fw \ + j784s4-main-r5f0_0-fw \ + j784s4-main-r5f0_1-fw \ + j784s4-main-r5f1_0-fw \ + j784s4-main-r5f1_1-fw \ + j784s4-main-r5f2_0-fw \ + j784s4-main-r5f2_1-fw \ + j784s4-c71_0-fw \ + j784s4-c71_1-fw \ + j784s4-c71_2-fw \ + j784s4-c71_3-fw \ + " + +ALTERNATIVE_${PN}_j784s4-hs-evm = "\ + j784s4-mcu-r5f0_0-fw \ + j784s4-mcu-r5f0_1-fw \ + j784s4-main-r5f0_0-fw \ + j784s4-main-r5f0_1-fw \ + j784s4-main-r5f1_0-fw \ + j784s4-main-r5f1_1-fw \ + j784s4-main-r5f2_0-fw \ + j784s4-main-r5f2_1-fw \ + j784s4-c71_0-fw \ + j784s4-c71_1-fw \ + j784s4-c71_2-fw \ + j784s4-c71_3-fw \ + " + +ALTERNATIVE_${PN}_j784s4-hs-evm += "\ + j784s4-main-r5f0_0-fw-sec \ + j784s4-main-r5f0_1-fw-sec \ + j784s4-main-r5f1_0-fw-sec \ + j784s4-main-r5f1_1-fw-sec \ + j784s4-main-r5f2_0-fw-sec \ + j784s4-main-r5f2_1-fw-sec \ + j784s4-c71_0-fw-sec \ + j784s4-c71_1-fw-sec \ + j784s4-c71_2-fw-sec \ + j784s4-c71_3-fw-sec \ + " + # Set up link names for the firmwares TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" @@ -248,6 +561,12 @@ TARGET_MCU_M4FSS0_0_am64xx = "am64-mcu-m4f0_0-fw" TARGET_MAIN_R5FSS0_0_am62xx = "am62-main-r5f0_0-fw" TARGET_MCU_M4FSS0_0_am62xx = "am62-mcu-m4f0_0-fw" +TARGET_MAIN_R5FSS0_0_am62xx-lp-evm = "am62-main-r5f0_0-fw" +TARGET_MCU_M4FSS0_0_am62xx-lp-evm = "am62-mcu-m4f0_0-fw" + +TARGET_C7X_0_am62axx = "am62a-c71_0-fw" +TARGET_MCU_R5F0_0_am62axx = "am62a-mcu-r5f0_0-fw" + TARGET_MCU_R5FSS0_0_j7 = "j7-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_j7 = "j7-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0_j7 = "j7-main-r5f0_0-fw" @@ -258,6 +577,14 @@ TARGET_C66_0_j7 = "j7-c66_0-fw" TARGET_C66_1_j7 = "j7-c66_1-fw" TARGET_C7X_0_j7 = "j7-c71_0-fw" +TARGET_MAIN_R5FSS0_0_SIGNED_j7-hs-evm = "j7-main-r5f0_0-fw-sec" +TARGET_MAIN_R5FSS0_1_SIGNED_j7-hs-evm = "j7-main-r5f0_1-fw-sec" +TARGET_MAIN_R5FSS1_0_SIGNED_j7-hs-evm = "j7-main-r5f1_0-fw-sec" +TARGET_MAIN_R5FSS1_1_SIGNED_j7-hs-evm = "j7-main-r5f1_1-fw-sec" +TARGET_C66_0_SIGNED_j7-hs-evm = "j7-c66_0-fw-sec" +TARGET_C66_1_SIGNED_j7-hs-evm = "j7-c66_1-fw-sec" +TARGET_C7X_0_SIGNED_j7-hs-evm = "j7-c71_0-fw-sec" + TARGET_MCU_R5FSS0_0_j7200-evm = "j7200-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_j7200-evm = "j7200-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0_j7200-evm = "j7200-main-r5f0_0-fw" @@ -268,6 +595,9 @@ TARGET_MCU_R5FSS0_1_j7200-hs-evm = "j7200-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0_j7200-hs-evm = "j7200-main-r5f0_0-fw" TARGET_MAIN_R5FSS0_1_j7200-hs-evm = "j7200-main-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0_SIGNED_j7200-hs-evm = "j7200-main-r5f0_0-fw-sec" +TARGET_MAIN_R5FSS0_1_SIGNED_j7200-hs-evm = "j7200-main-r5f0_1-fw-sec" + TARGET_MCU_R5FSS0_0_j721s2-evm = "j721s2-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_j721s2-evm = "j721s2-mcu-r5f0_1-fw" TARGET_MAIN_R5FSS0_0_j721s2-evm = "j721s2-main-r5f0_0-fw" @@ -277,6 +607,59 @@ 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" + +TARGET_MAIN_R5FSS0_0_SIGNED_j721s2-hs-evm = "j721s2-main-r5f0_0-fw-sec" +TARGET_MAIN_R5FSS0_1_SIGNED_j721s2-hs-evm = "j721s2-main-r5f0_1-fw-sec" +TARGET_MAIN_R5FSS1_0_SIGNED_j721s2-hs-evm = "j721s2-main-r5f1_0-fw-sec" +TARGET_MAIN_R5FSS1_1_SIGNED_j721s2-hs-evm = "j721s2-main-r5f1_1-fw-sec" +TARGET_C7X_0_SIGNED_j721s2-hs-evm = "j721s2-c71_0-fw-sec" +TARGET_C7X_1_SIGNED_j721s2-hs-evm = "j721s2-c71_1-fw-sec" + +TARGET_MCU_R5FSS0_0_j784s4-evm = "j784s4-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1_j784s4-evm = "j784s4-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0_j784s4-evm = "j784s4-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1_j784s4-evm = "j784s4-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0_j784s4-evm = "j784s4-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1_j784s4-evm = "j784s4-main-r5f1_1-fw" +TARGET_MAIN_R5FSS2_0_j784s4-evm = "j784s4-main-r5f2_0-fw" +TARGET_MAIN_R5FSS2_1_j784s4-evm = "j784s4-main-r5f2_1-fw" +TARGET_C7X_0_j784s4-evm = "j784s4-c71_0-fw" +TARGET_C7X_1_j784s4-evm = "j784s4-c71_1-fw" +TARGET_C7X_2_j784s4-evm = "j784s4-c71_2-fw" +TARGET_C7X_3_j784s4-evm = "j784s4-c71_3-fw" + +TARGET_MCU_R5FSS0_0_j784s4-hs-evm = "j784s4-mcu-r5f0_0-fw" +TARGET_MCU_R5FSS0_1_j784s4-hs-evm = "j784s4-mcu-r5f0_1-fw" +TARGET_MAIN_R5FSS0_0_j784s4-hs-evm = "j784s4-main-r5f0_0-fw" +TARGET_MAIN_R5FSS0_1_j784s4-hs-evm = "j784s4-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0_j784s4-hs-evm = "j784s4-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1_j784s4-hs-evm = "j784s4-main-r5f1_1-fw" +TARGET_MAIN_R5FSS2_0_j784s4-hs-evm = "j784s4-main-r5f2_0-fw" +TARGET_MAIN_R5FSS2_1_j784s4-hs-evm = "j784s4-main-r5f2_1-fw" +TARGET_C7X_0_j784s4-hs-evm = "j784s4-c71_0-fw" +TARGET_C7X_1_j784s4-hs-evm = "j784s4-c71_1-fw" +TARGET_C7X_2_j784s4-hs-evm = "j784s4-c71_2-fw" +TARGET_C7X_3_j784s4-hs-evm = "j784s4-c71_3-fw" + +TARGET_MAIN_R5FSS0_0_SIGNED_j784s4-hs-evm = "j784s4-main-r5f0_0-fw-sec" +TARGET_MAIN_R5FSS0_1_SIGNED_j784s4-hs-evm = "j784s4-main-r5f0_1-fw-sec" +TARGET_MAIN_R5FSS1_0_SIGNED_j784s4-hs-evm = "j784s4-main-r5f1_0-fw-sec" +TARGET_MAIN_R5FSS1_1_SIGNED_j784s4-hs-evm = "j784s4-main-r5f1_1-fw-sec" +TARGET_MAIN_R5FSS2_0_SIGNED_j784s4-hs-evm = "j784s4-main-r5f2_0-fw-sec" +TARGET_MAIN_R5FSS2_1_SIGNED_j784s4-hs-evm = "j784s4-main-r5f2_1-fw-sec" +TARGET_C7X_0_SIGNED_j784s4-hs-evm = "j784s4-c71_0-fw-sec" +TARGET_C7X_1_SIGNED_j784s4-hs-evm = "j784s4-c71_1-fw-sec" +TARGET_C7X_2_SIGNED_j784s4-hs-evm = "j784s4-c71_2-fw-sec" +TARGET_C7X_3_SIGNED_j784s4-hs-evm = "j784s4-c71_3-fw-sec" + 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}" @@ -289,6 +672,9 @@ ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MC ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_M4FSS0_0}" +ALTERNATIVE_LINK_NAME[am62a-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}" +ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5F0_0}" + ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" @@ -299,11 +685,22 @@ ALTERNATIVE_LINK_NAME[j7-c66_0-fw] = "${base_libdir}/firmware/${TARGET_C66_0}" ALTERNATIVE_LINK_NAME[j7-c66_1-fw] = "${base_libdir}/firmware/${TARGET_C66_1}" ALTERNATIVE_LINK_NAME[j7-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-c66_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C66_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-c66_1-fw-sec] = "${base_libdir}/firmware/${TARGET_C66_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j7-c71_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_0_SIGNED}" + ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j7200-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1_SIGNED}" + ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" @@ -313,6 +710,37 @@ ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}" ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw] = "${base_libdir}/firmware/${TARGET_C7X_1}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-c71_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j721s2-c71_1-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_1_SIGNED}" + +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS2_0}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_1-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS2_1}" +ALTERNATIVE_LINK_NAME[j784s4-c71_0-fw] = "${base_libdir}/firmware/${TARGET_C7X_0}" +ALTERNATIVE_LINK_NAME[j784s4-c71_1-fw] = "${base_libdir}/firmware/${TARGET_C7X_1}" +ALTERNATIVE_LINK_NAME[j784s4-c71_2-fw] = "${base_libdir}/firmware/${TARGET_C7X_2}" +ALTERNATIVE_LINK_NAME[j784s4-c71_3-fw] = "${base_libdir}/firmware/${TARGET_C7X_3}" + +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS1_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_0-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS2_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-main-r5f2_1-fw-sec] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS2_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-c71_0-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_0_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-c71_1-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_1_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-c71_2-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_2_SIGNED}" +ALTERNATIVE_LINK_NAME[j784s4-c71_3-fw-sec] = "${base_libdir}/firmware/${TARGET_C7X_3_SIGNED}" + # Create the firmware alternatives ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_0_release_strip.xer5f" @@ -327,6 +755,9 @@ ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_ec ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_baremetal_test_mcu2_0_release_strip.xer5f" +ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" +ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/am62a-mcu-r5f0_0-fw" + ALTERNATIVE_TARGET[j7-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" @@ -337,11 +768,22 @@ ALTERNATIVE_TARGET[j7-c66_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test ALTERNATIVE_TARGET[j7-c66_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66" ALTERNATIVE_TARGET[j7-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" +ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7-c66_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_1_release_strip.xe66.signed" +ALTERNATIVE_TARGET[j7-c66_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c66xdsp_2_release_strip.xe66.signed" +ALTERNATIVE_TARGET[j7-c71_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71.signed" + ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j7200-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f.signed" +ALTERNATIVE_TARGET[j7200-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed" + ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" ALTERNATIVE_TARGET[j721s2-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f" @@ -351,6 +793,37 @@ ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc ALTERNATIVE_TARGET[j721s2-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" ALTERNATIVE_TARGET[j721s2-c71_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71" +ALTERNATIVE_TARGET[j721s2-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j721s2-c71_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71.signed" +ALTERNATIVE_TARGET[j721s2-c71_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71.signed" + +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_testb_mcu1_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-mcu-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu1_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f1_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f1_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f2_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu4_0_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-main-r5f2_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu4_1_release_strip.xer5f" +ALTERNATIVE_TARGET[j784s4-c71_0-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71" +ALTERNATIVE_TARGET[j784s4-c71_1-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71" +ALTERNATIVE_TARGET[j784s4-c71_2-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_3_release_strip.xe71" +ALTERNATIVE_TARGET[j784s4-c71_3-fw] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_4_release_strip.xe71" + +ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${base_libdir}/firmware/ethfw/app_remoteswitchcfg_server_strip.xer5f.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f0_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu2_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f1_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f1_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu3_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f2_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu4_0_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j784s4-main-r5f2_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_mcu4_1_release_strip.xer5f.signed" +ALTERNATIVE_TARGET[j784s4-c71_0-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_1_release_strip.xe71.signed" +ALTERNATIVE_TARGET[j784s4-c71_1-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_2_release_strip.xe71.signed" +ALTERNATIVE_TARGET[j784s4-c71_2-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_3_release_strip.xe71.signed" +ALTERNATIVE_TARGET[j784s4-c71_3-fw-sec] = "${base_libdir}/firmware/pdk-ipc/ipc_echo_test_c7x_4_release_strip.xe71.signed" + ALTERNATIVE_PRIORITY = "10" # make sure that lib/firmware, and all its contents are part of the package diff --git a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb index e435676f..2f84e60e 100644 --- a/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb +++ b/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb @@ -16,8 +16,8 @@ PLAT_SFX_am65xx = "/am65xx" PLAT_SFX_am64xx = "/am64x" # Use weak assignment to set defaults to TI_RTOS_METADATA_* variables -TI_RTOS_METADATA_URI ?= "git://git.ti.com/processor-sdk/coresdk_rtos_releases.git" -TI_RTOS_METADATA_PROTOCOL ?= "git" +TI_RTOS_METADATA_URI ?= "git://git.ti.com/git/processor-sdk/coresdk_rtos_releases.git" +TI_RTOS_METADATA_PROTOCOL ?= "https" TI_RTOS_METADATA_SRCREV ?= "2ecbf45af64bc47806623cc5bf7ab493489acaf9" TI_RTOS_METADATA_BRANCH ?= "master" TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}" diff --git a/recipes-ti/udma/udma_git.bb b/recipes-ti/udma/udma_git.bb index c905fa58..caea6e8f 100644 --- a/recipes-ti/udma/udma_git.bb +++ b/recipes-ti/udma/udma_git.bb @@ -5,7 +5,7 @@ COMPATIBLE_MACHINE = "keystone" LIC_FILES_CHKSUM = "file://include/udma.h;startline=1;endline=39;md5=ba3c7f91f970afe073b759ced61d0f27" BRANCH = "master" -SRC_URI = "git://git.ti.com/keystone-linux/udma.git;protocol=git;branch=${BRANCH}" +SRC_URI = "git://git.ti.com/git/keystone-linux/udma.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" # Commit corresponds to UDMA.01.00.00.00 SRCREV = "53d09fb0bc98c41c5eb43623097e363c497d6fd8" diff --git a/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb b/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb index cbae1b11..2d7a0831 100644 --- a/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb +++ b/recipes-ti/uio-test-pruss/uio-test-pruss_git.bb @@ -10,8 +10,8 @@ DEPENDS = "ti-cgt-pru-native" BRANCH = "master" LIC_FILES_CHKSUM = "file://Makefile;startline=1;endline=31;md5=0ee4f2c42eb6b04e37859bb55a18b144" -UIO_TEST_PRUSS_GIT_URI = "git://git.ti.com/processor-sdk/uio-test-pruss.git" -UIO_TEST_PRUSS_GIT_PROTOCOL = "git" +UIO_TEST_PRUSS_GIT_URI = "git://git.ti.com/git/processor-sdk/uio-test-pruss.git" +UIO_TEST_PRUSS_GIT_PROTOCOL = "https" SRC_URI = "${UIO_TEST_PRUSS_GIT_URI};protocol=${UIO_TEST_PRUSS_GIT_PROTOCOL};branch=${BRANCH}" # Corresponds to version 01.00.02.00 |