diff options
| author |   takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
|---|---|---|
| committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
| commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
| tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /bsp/meta-ti | |
| parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) | |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'bsp/meta-ti')
194 files changed, 1111 insertions, 1284 deletions
diff --git a/bsp/meta-ti/README b/bsp/meta-ti/README index 3df51b88..e6d342b9 100644 --- a/bsp/meta-ti/README +++ b/bsp/meta-ti/README @@ -8,7 +8,7 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta -branch: thud +branch: master The base BSP part of meta-ti should work with different OpenEmbedded/Yocto @@ -18,8 +18,10 @@ distro-less (only with OE-Core), with Yocto/Poky, with Angstrom or Arago. Please follow the recommended setup procedures of your OE distribution. -Send pull requests, patches, comments or questions to meta-ti@yoctoproject.org +Send pull requests, patches, comments or questions to: +meta-ti@lists.yoctoproject.org + Please note - meta-ti mailing list requires subscription for posting: -https://lists.yoctoproject.org/listinfo/meta-ti +https://lists.yoctoproject.org/g/meta-ti Maintainers: Denys Dmytriyenko <denys@ti.com> diff --git a/bsp/meta-ti/classes/ti-pdk-fetch.bbclass b/bsp/meta-ti/classes/ti-pdk-fetch.bbclass index 7108d001..fae32309 100644 --- a/bsp/meta-ti/classes/ti-pdk-fetch.bbclass +++ b/bsp/meta-ti/classes/ti-pdk-fetch.bbclass @@ -1,11 +1,12 @@ TI_PDK_GIT_URI ?= "git://git.ti.com/processor-sdk/pdk.git" TI_PDK_GIT_BRANCH ?= "master" TI_PDK_GIT_PROTOCOL ?= "git" -TI_PDK_SRCREV ?= "5ddf121a09af4ac58a18103848d4ab8e741e23d6" +TI_PDK_SRCREV ?= "0d2591302b03ddae9a25300818e03345658b9083" -TI_PDK_VERSION ?= "2020.1.22" +TI_PDK_VERSION ?= "07.00.00.34" PV = "${TI_PDK_VERSION}" +PE = "1" TI_PDK_COMP ?= "" TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}" diff --git a/bsp/meta-ti/classes/ti-pdk.bbclass b/bsp/meta-ti/classes/ti-pdk.bbclass index a07fdbb3..37305e89 100644 --- a/bsp/meta-ti/classes/ti-pdk.bbclass +++ b/bsp/meta-ti/classes/ti-pdk.bbclass @@ -10,9 +10,9 @@ DEPENDS_remove_ti33x = "ti-cgt6x-native" DEPENDS_remove_ti43x = "ti-cgt6x-native" DEPENDS_append_omapl1 = " ti-cgt-arm-native" DEPENDS_remove_am65xx = "gcc-arm-none-eabi-native ti-cgt6x-native" -DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native" -DEPENDS_remove_j7-evm = "gcc-arm-none-eabi-native" -DEPENDS_append_j7-evm = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native ti-cgt7x-native" +DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-aarch64-none-elf-native" +DEPENDS_remove_j7 = "gcc-arm-none-eabi-native" +DEPENDS_append_j7 = " ti-cgt-arm-native gcc-aarch64-none-elf-native ti-cgt7x-native" S = "${WORKDIR}/git" B = "${WORKDIR}/build" diff --git a/bsp/meta-ti/conf/layer.conf b/bsp/meta-ti/conf/layer.conf index 824443d4..7848d196 100644 --- a/bsp/meta-ti/conf/layer.conf +++ b/bsp/meta-ti/conf/layer.conf @@ -8,17 +8,18 @@ BBFILE_COLLECTIONS += "meta-ti" BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-ti = "6" -LAYERSERIES_COMPAT_meta-ti = "sumo thud" +LAYERSERIES_COMPAT_meta-ti = "sumo thud warrior zeus dunfell" LICENSE_PATH += "${LAYERDIR}/licenses" -LAYERDEPENDS_meta-ti = "core" +LAYERDEPENDS_meta-ti = " \ + core \ + meta-arm \ +" SIGGEN_EXCLUDERECIPES_ABISAFE += " \ ti-sgx-ddk-km \ ti-sgx-ddk-um \ - ti-ipc \ - ti-ipc-rtos \ cmem-mod \ hplib-mod \ gdbserverproxy-module-drv \ diff --git a/bsp/meta-ti/conf/machine/am335x-evm.conf b/bsp/meta-ti/conf/machine/am335x-evm.conf index 3cb97d30..469c4d37 100644 --- a/bsp/meta-ti/conf/machine/am335x-evm.conf +++ b/bsp/meta-ti/conf/machine/am335x-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/ti33x.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "ubifs ubi tar.xz" +IMAGE_FSTYPES += "ubifs ubi" # Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3" @@ -24,7 +24,7 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # UBI: logical eraseblock size: 126976 bytes # from ubiattach stdout: # UBI device number 0, total 1988 LEBs -MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 10200" +MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900" # do ubiattach /dev/ubi_ctrl -m 7 -O 2048 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/am3517-evm.conf b/bsp/meta-ti/conf/machine/am3517-evm.conf index 87e3f1e0..c20e2f6a 100644 --- a/bsp/meta-ti/conf/machine/am3517-evm.conf +++ b/bsp/meta-ti/conf/machine/am3517-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen ethernet" -IMAGE_FSTYPES += "ubi tar.gz" +IMAGE_FSTYPES += "ubi tar.xz" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLES = "115200;ttyS2" diff --git a/bsp/meta-ti/conf/machine/am37x-evm.conf b/bsp/meta-ti/conf/machine/am37x-evm.conf index e9d1838a..a512c8d0 100644 --- a/bsp/meta-ti/conf/machine/am37x-evm.conf +++ b/bsp/meta-ti/conf/machine/am37x-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen ethernet" -IMAGE_FSTYPES += "ubi tar.gz" +IMAGE_FSTYPES += "ubi tar.xz" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" KERNEL_DEVICETREE = "omap3-evm-37xx.dtb" diff --git a/bsp/meta-ti/conf/machine/am437x-evm.conf b/bsp/meta-ti/conf/machine/am437x-evm.conf index bd1053a4..4e3681d5 100644 --- a/bsp/meta-ti/conf/machine/am437x-evm.conf +++ b/bsp/meta-ti/conf/machine/am437x-evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/ti43x.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "ubifs ubi tar.xz" +IMAGE_FSTYPES += "ubifs ubi" SERIAL_CONSOLES = "115200;ttyS0" @@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyS0" # UBI: logical eraseblock size: 253952 bytes # from ubiattach stdout: # UBI device number 0, total 994 LEBs -MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 5000" +MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 4800" # do ubiattach /dev/ubi_ctrl -m 11 -O 4096 # from dmesg: diff --git a/bsp/meta-ti/conf/machine/am57xx-evm.conf b/bsp/meta-ti/conf/machine/am57xx-evm.conf index a0b1b532..3b0c18af 100644 --- a/bsp/meta-ti/conf/machine/am57xx-evm.conf +++ b/bsp/meta-ti/conf/machine/am57xx-evm.conf @@ -6,18 +6,25 @@ require conf/machine/include/dra7xx.inc MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "tar.xz" - SERIAL_CONSOLES = "115200;ttyS2" KERNEL_DEVICETREE = " \ - am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb \ + am57xx-beagle-x15.dtb \ + am57xx-beagle-x15-revb1.dtb \ + am57xx-beagle-x15-revc.dtb \ am5729-beagleboneai.dtb \ - am57xx-evm.dtb am57xx-evm-cam-mt9t111.dtb am57xx-evm-cam-ov10635.dtb \ - am57xx-evm-reva3.dtb am57xx-evm-reva3-cam-mt9t111.dtb am57xx-evm-reva3-cam-ov10635.dtb \ - am571x-idk.dtb am571x-idk-lcd-osd101t2045.dtb am571x-idk-lcd-osd101t2587.dtb \ - am572x-idk.dtb am572x-idk-lcd-osd101t2045.dtb am572x-idk-lcd-osd101t2587.dtb \ - am574x-idk.dtb am574x-idk-lcd-osd101t2587.dtb \ + am57xx-evm.dtb \ + am57xx-evm-cam-ov10635.dtb \ + am57xx-evm-reva3.dtb \ + am57xx-evm-reva3-cam-ov10635.dtb \ + am571x-idk.dtb \ + am571x-idk-lcd-osd101t2045.dtb \ + am571x-idk-lcd-osd101t2587.dtb \ + am572x-idk.dtb \ + am572x-idk-lcd-osd101t2045.dtb \ + am572x-idk-lcd-osd101t2587.dtb \ + am574x-idk.dtb \ + am574x-idk-lcd-osd101t2587.dtb \ " 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/bsp/meta-ti/conf/machine/am65xx-evm-k3r5-sr2.conf b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5-sr2.conf new file mode 100644 index 00000000..c0b3cd51 --- /dev/null +++ b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5-sr2.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: AM65xx SR2.0 EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 EVM (R5F core) + +# Booting SR2 requires different SYSFW, the rest is handled at runtime + +require conf/machine/am65xx-evm-k3r5.conf +SOC_FAMILY_append = ":k3r5-sr2" + +SYSFW_SOC = "am65x_sr2" +SYSFW_SYMLINK = "sysfw.itb" diff --git a/bsp/meta-ti/conf/machine/am65xx-evm-k3r5.conf b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5.conf new file mode 100644 index 00000000..bd17474e --- /dev/null +++ b/bsp/meta-ti/conf/machine/am65xx-evm-k3r5.conf @@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: AM65xx EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM65xx EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am65x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" +SYSFW_SYMLINK = "" + +UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/bsp/meta-ti/conf/machine/am65xx-evm.conf b/bsp/meta-ti/conf/machine/am65xx-evm.conf index 82959ce3..2f3b92a8 100644 --- a/bsp/meta-ti/conf/machine/am65xx-evm.conf +++ b/bsp/meta-ti/conf/machine/am65xx-evm.conf @@ -4,33 +4,10 @@ require conf/machine/include/am65xx.inc -MACHINE_FEATURES += "touchscreen" - -IMAGE_FSTYPES += "tar.xz wic.xz" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" -SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" - -KERNEL_DEVICETREE = " \ - ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \ - ti/k3-am654-evm-hdmi.dtbo ti/k3-am654-idk.dtbo \ - ti/k3-am654-evm-csi2-ov490.dtbo ti/k3-am654-evm-csi2-ov5640.dtbo \ - ti/k3-am654-evm-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \ - ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \ - ti/k3-am654-base-board-jailhouse.dtbo \ - ti/k3-am654-evm-prupwm.dtbo \ -" +BBMULTICONFIG += "k3r5-sr2" UBOOT_MACHINE = "am65x_evm_a53_defconfig" -OPTEEMACHINE = "k3" -OPTEEFLAVOR = "am65x" -OPTEEOUTPUTMACHINE = "k3" - -# Please note that booting AM65xx platform also requires -# tiboot3.bin and sysfw.itb, which are provided by meta-arago -# u-boot-k3-r5 and ti-sci-fw recipes -IMAGE_BOOT_FILES = "tispl.bin u-boot.img" -WKS_FILE ?= "sdimage-bootpart.wks" - -do_image_wic[depends] += "u-boot:do_deploy" +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/bsp/meta-ti/conf/machine/am65xx-hs-evm-k3r5.conf b/bsp/meta-ti/conf/machine/am65xx-hs-evm-k3r5.conf new file mode 100644 index 00000000..2b06f2cc --- /dev/null +++ b/bsp/meta-ti/conf/machine/am65xx-hs-evm-k3r5.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: AM65xx HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am65x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf index f9897504..e4eebb6a 100644 --- a/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf +++ b/bsp/meta-ti/conf/machine/am65xx-hs-evm.conf @@ -2,7 +2,7 @@ #@NAME: AM65xx HS EVM #@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM -require conf/machine/am65xx-evm.conf +require conf/machine/include/am65xx.inc UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" @@ -20,7 +20,3 @@ UBOOT_BINARY = "u-boot.img_HS" IMAGE_BOOT_FILES = "${UBOOT_BINARY}" TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" - -OPTEEMACHINE = "k3" -OPTEEFLAVOR = "am65x" -OPTEEOUTPUTMACHINE = "k3" diff --git a/bsp/meta-ti/conf/machine/beagle-x15.conf b/bsp/meta-ti/conf/machine/beagle-x15.conf index d5e05ec7..c7503266 100644 --- a/bsp/meta-ti/conf/machine/beagle-x15.conf +++ b/bsp/meta-ti/conf/machine/beagle-x15.conf @@ -11,28 +11,3 @@ MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLES = "115200;ttyS2" UBOOT_MACHINE = "am57xx_evm_config" - -WKS_FILE ?= "sdimage-bootpart.wks" -IMAGE_BOOT_FILES = "MLO u-boot.img" -IMAGE_FSTYPES += "tar.xz wic.xz" - -# UBI information. Note that this is board and kernel specific. Changes -# in your kernel port may require changes in these variables. For more -# details about this board please see -# http://processors.wiki.ti.com/index.php/UBIFS_Support - -# do ubiattach /dev/ubi_ctrl -m 7 -O 2048 -# From dmesg: -# UBI: smallest flash I/O unit: 2048 -# UBI: logical eraseblock size: 126976 bytes -# from ubiattach stdout: -# UBI device number 0, total 1988 LEBs -MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192" - -# do ubiattach /dev/ubi_ctrl -m 7 -O 2048 -# from dmesg: -# UBI: smallest flash I/O unit: 2048 -# UBI: physical eraseblock size: 131072 bytes (128 KiB) -# UBI: sub-page size: 512 -# UBI: VID header offset: 2048 (aligned 2048) -UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048" diff --git a/bsp/meta-ti/conf/machine/beagleboard.conf b/bsp/meta-ti/conf/machine/beagleboard.conf index 37d23aa7..ee51fd66 100644 --- a/bsp/meta-ti/conf/machine/beagleboard.conf +++ b/bsp/meta-ti/conf/machine/beagleboard.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc # Only has DVI connector for external screen MACHINE_GUI_CLASS = "bigscreen" -IMAGE_FSTYPES += "tar.gz ubi" +IMAGE_FSTYPES += "tar.xz ubi" EXTRA_IMAGECMD_jffs2 = "-lnp" KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb" diff --git a/bsp/meta-ti/conf/machine/beaglebone.conf b/bsp/meta-ti/conf/machine/beaglebone.conf index d8fd4062..896a9d73 100644 --- a/bsp/meta-ti/conf/machine/beaglebone.conf +++ b/bsp/meta-ti/conf/machine/beaglebone.conf @@ -13,12 +13,6 @@ MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLES = "115200;ttyS0" -WKS_FILE ?= "sdimage-bootpart.wks" - -IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY}" - -IMAGE_FSTYPES += "tar.xz wic.xz" - IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" # Refine the list of device targets for ti-pdk class recipes diff --git a/bsp/meta-ti/conf/machine/dra7xx-evm.conf b/bsp/meta-ti/conf/machine/dra7xx-evm.conf index ada32073..67f9a0d1 100644 --- a/bsp/meta-ti/conf/machine/dra7xx-evm.conf +++ b/bsp/meta-ti/conf/machine/dra7xx-evm.conf @@ -6,17 +6,23 @@ require conf/machine/include/dra7xx.inc MACHINE_FEATURES += "touchscreen" -IMAGE_FSTYPES += "tar.xz" - SERIAL_CONSOLES = "115200;ttyS0" KERNEL_DEVICETREE = " \ - dra7-evm.dtb dra7-evm-lcd-osd101t2045.dtb dra7-evm-lcd-osd101t2587.dtb \ - dra71-evm.dtb dra71-evm-nand.dtb dra71-evm-lcd-auo-g101evn01.0.dtb \ - dra72-evm.dtb dra72-evm-lcd-osd101t2045.dtb dra72-evm-lcd-osd101t2587.dtb \ - dra72-evm-revc.dtb dra72-evm-revc-lcd-osd101t2045.dtb dra72-evm-revc-lcd-osd101t2587.dtb \ - dra76-evm.dtb dra76-evm-tfp410.dtb dra76-evm-ov490.dtb dra76-evm-ov5640.dtb \ - dra76-evm-tfp410-ov490.dtb dra76-evm-tfp410-ov5640.dtb \ + dra7-evm.dtb \ + dra7-evm-lcd-osd101t2045.dtb \ + dra7-evm-lcd-osd101t2587.dtb \ + dra71-evm.dtb \ + dra71-evm-nand.dtb \ + dra71-evm-lcd-auo-g101evn01.0.dtb \ + dra72-evm.dtb \ + dra72-evm-lcd-osd101t2045.dtb \ + dra72-evm-lcd-osd101t2587.dtb \ + dra72-evm-revc.dtb \ + dra72-evm-revc-lcd-osd101t2045.dtb \ + dra72-evm-revc-lcd-osd101t2587.dtb \ + dra76-evm.dtb \ + dra76-evm-tfp410.dtb \ " UBOOT_MACHINE = "dra7xx_evm_config" diff --git a/bsp/meta-ti/conf/machine/include/am65xx.inc b/bsp/meta-ti/conf/machine/include/am65xx.inc index d433ed10..f60d1662 100644 --- a/bsp/meta-ti/conf/machine/include/am65xx.inc +++ b/bsp/meta-ti/conf/machine/include/am65xx.inc @@ -1,6 +1,30 @@ require conf/machine/include/k3.inc SOC_FAMILY_append = ":am65xx" +MACHINE_FEATURES += "touchscreen" + +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +KERNEL_DEVICETREE = " \ + ti/k3-am654-base-board.dtb \ + ti/k3-am654-base-board-sr1.dtb \ + ti/k3-am654-gp.dtbo \ + ti/k3-am654-idk.dtbo \ + ti/k3-am654-idk-sr1.dtbo \ + ti/k3-am654-evm-hdmi.dtbo \ + ti/k3-am654-evm-oldi-lcd1evm.dtbo \ + ti/k3-am654-evm-tc358876.dtbo \ + ti/k3-am654-pcie-usb2.dtbo \ + ti/k3-am654-pcie-usb3.dtbo \ + ti/k3-am654-base-board-jailhouse.dtbo \ + ti/k3-am654-evm-prupwm.dtbo \ +" + +OPTEEMACHINE = "k3" +OPTEEFLAVOR = "am65x" +OPTEEOUTPUTMACHINE = "k3" + # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am65xx" TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk" diff --git a/bsp/meta-ti/conf/machine/include/davinci.inc b/bsp/meta-ti/conf/machine/include/davinci.inc index 6de64839..62ca6887 100644 --- a/bsp/meta-ti/conf/machine/include/davinci.inc +++ b/bsp/meta-ti/conf/machine/include/davinci.inc @@ -5,7 +5,7 @@ MACHINE_KERNEL_PR = "r54" KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/j7.inc b/bsp/meta-ti/conf/machine/include/j7.inc new file mode 100644 index 00000000..f6d91615 --- /dev/null +++ b/bsp/meta-ti/conf/machine/include/j7.inc @@ -0,0 +1,11 @@ +require conf/machine/include/k3.inc +SOC_FAMILY_append = ":j7" + +OPTEEMACHINE = "k3" +OPTEEFLAVOR = "j7" +OPTEEOUTPUTMACHINE = "k3" + +# 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" +TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1" diff --git a/bsp/meta-ti/conf/machine/include/k3.inc b/bsp/meta-ti/conf/machine/include/k3.inc index 8b836ea8..6b78f4ca 100644 --- a/bsp/meta-ti/conf/machine/include/k3.inc +++ b/bsp/meta-ti/conf/machine/include/k3.inc @@ -1,12 +1,16 @@ +# TI K3 Aarch64 profile for Cortex-A53/A72 cores + require conf/machine/include/ti-soc.inc SOC_FAMILY_append = ":k3" require conf/machine/include/arm/arch-arm64.inc +BBMULTICONFIG += "k3r5" + # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r0" -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -22,6 +26,9 @@ UBOOT_SUFFIX = "img" EXTRA_IMAGEDEPENDS += "virtual/bootloader" +TFA_PLATFORM = "k3" +TFA_BOARD = "generic" + MACHINE_GUI_CLASS = "smallscreen" # Use the expected value of the ubifs filesystem's volume name in the kernel @@ -31,3 +38,11 @@ UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet pci gpu" # Not ready yet - dsp mmip + +IMAGE_FSTYPES += "tar.xz wic.xz" + +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +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" diff --git a/bsp/meta-ti/conf/machine/include/k3r5.inc b/bsp/meta-ti/conf/machine/include/k3r5.inc new file mode 100644 index 00000000..52fcf38b --- /dev/null +++ b/bsp/meta-ti/conf/machine/include/k3r5.inc @@ -0,0 +1,23 @@ +# TI K3 Armv7 profile for Cortex-R5F cores + +require conf/machine/include/ti-soc.inc +SOC_FAMILY_append = ":k3r5" + +# The closest of existing tunes for Cortex-R5F +DEFAULTTUNE = "armv7athf" +require conf/machine/include/tune-cortexa8.inc + +# R5 runs early bootloader and loads SYSFW +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README +# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/j721e/README +PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" +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}" + +PACKAGECONFIG_pn-u-boot-ti-staging = "" diff --git a/bsp/meta-ti/conf/machine/include/keystone.inc b/bsp/meta-ti/conf/machine/include/keystone.inc index ef33975f..e7ea9758 100644 --- a/bsp/meta-ti/conf/machine/include/keystone.inc +++ b/bsp/meta-ti/conf/machine/include/keystone.inc @@ -4,7 +4,7 @@ SOC_FAMILY_append = ":keystone" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/tune-cortexa15.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/omap-a15.inc b/bsp/meta-ti/conf/machine/include/omap-a15.inc index cc055365..e491d2b5 100644 --- a/bsp/meta-ti/conf/machine/include/omap-a15.inc +++ b/bsp/meta-ti/conf/machine/include/omap-a15.inc @@ -7,7 +7,7 @@ require conf/machine/include/tune-cortexa15.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r7" -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -36,4 +36,9 @@ MACHINE_GUI_CLASS = "smallscreen" UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" + +IMAGE_FSTYPES += "tar.xz wic.xz" +WKS_FILE ?= "sdimage-2part.wks" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +do_image_wic[depends] += "u-boot:do_deploy" diff --git a/bsp/meta-ti/conf/machine/include/omap3.inc b/bsp/meta-ti/conf/machine/include/omap3.inc index 489f1f9a..5696c82d 100644 --- a/bsp/meta-ti/conf/machine/include/omap3.inc +++ b/bsp/meta-ti/conf/machine/include/omap3.inc @@ -22,7 +22,7 @@ MACHINE_KERNEL_PR = "r127" KERNEL_IMAGETYPE = "zImage" # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/omap4.inc b/bsp/meta-ti/conf/machine/include/omap4.inc index d9706066..cbca267c 100644 --- a/bsp/meta-ti/conf/machine/include/omap4.inc +++ b/bsp/meta-ti/conf/machine/include/omap4.inc @@ -4,7 +4,7 @@ SOC_FAMILY_append = ":omap4" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/tune-cortexa9.inc -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" diff --git a/bsp/meta-ti/conf/machine/include/ti33x.inc b/bsp/meta-ti/conf/machine/include/ti33x.inc index 5ff6efea..abfd7ec7 100644 --- a/bsp/meta-ti/conf/machine/include/ti33x.inc +++ b/bsp/meta-ti/conf/machine/include/ti33x.inc @@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_KERNEL_PR = "r22" # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -28,11 +28,12 @@ KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = " \ am335x-evm.dtb am335x-evmsk.dtb \ - am335x-icev2.dtb am335x-icev2-prueth.dtb \ + am335x-icev2.dtb \ + am335x-icev2-prueth.dtb \ am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \ am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \ am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ - am335x-boneblack-prusuart.dtb am335x-sancloud-bbe.dtb \ + am335x-sancloud-bbe.dtb \ " KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}" @@ -58,3 +59,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am335x" TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x" + +IMAGE_FSTYPES += "tar.xz wic.xz" +WKS_FILE ?= "sdimage-2part.wks" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +do_image_wic[depends] += "u-boot:do_deploy" diff --git a/bsp/meta-ti/conf/machine/include/ti43x.inc b/bsp/meta-ti/conf/machine/include/ti43x.inc index a0cc9cc7..524b0b2c 100644 --- a/bsp/meta-ti/conf/machine/include/ti43x.inc +++ b/bsp/meta-ti/conf/machine/include/ti43x.inc @@ -20,7 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_KERNEL_PR = "r3" # Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" @@ -55,3 +55,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa etherne # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am437x" TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x" + +IMAGE_FSTYPES += "tar.xz wic.xz" +WKS_FILE ?= "sdimage-2part.wks" +IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}" +do_image_wic[depends] += "u-boot:do_deploy" diff --git a/bsp/meta-ti/conf/machine/j7-evm-k3r5.conf b/bsp/meta-ti/conf/machine/j7-evm-k3r5.conf new file mode 100644 index 00000000..b9e8cc01 --- /dev/null +++ b/bsp/meta-ti/conf/machine/j7-evm-k3r5.conf @@ -0,0 +1,11 @@ +#@TYPE: Machine +#@NAME: J7 EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J7 EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721e" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/bsp/meta-ti/conf/machine/j7-evm.conf b/bsp/meta-ti/conf/machine/j7-evm.conf index 318435d9..aedfc825 100644 --- a/bsp/meta-ti/conf/machine/j7-evm.conf +++ b/bsp/meta-ti/conf/machine/j7-evm.conf @@ -2,36 +2,17 @@ #@NAME: J7 EVM #@DESCRIPTION: Machine configuration for the TI J7 EVM -require conf/machine/include/k3.inc +require conf/machine/include/j7.inc -IMAGE_FSTYPES += "tar.xz wic.xz" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" +SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" 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-common-proc-board-infotainment-display-sharing.dtbo \ + ti/k3-j721e-pcie-backplane.dtbo \ ti/k3-j721e-common-proc-board-jailhouse.dtbo \ " UBOOT_MACHINE = "j721e_evm_a72_config" - -OPTEEMACHINE = "k3" -OPTEEFLAVOR = "j7" -OPTEEOUTPUTMACHINE = "k3" - -# Please note that booting J7 platform also requires -# tiboot3.bin and sysfw.itb, which are provided by meta-arago -# u-boot-k3-r5 and ti-sci-fw recipes -IMAGE_BOOT_FILES = "tispl.bin u-boot.img" -WKS_FILE ?= "sdimage-bootpart.wks" - -do_image_wic[depends] += "u-boot:do_deploy" - -# 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" -TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1" diff --git a/bsp/meta-ti/conf/machine/j7-hs-evm-k3r5.conf b/bsp/meta-ti/conf/machine/j7-hs-evm-k3r5.conf new file mode 100644 index 00000000..53a7016f --- /dev/null +++ b/bsp/meta-ti/conf/machine/j7-hs-evm-k3r5.conf @@ -0,0 +1,13 @@ +#@TYPE: Machine +#@NAME: J7 HS EVM (R5F) +#@DESCRIPTION: Machine configuration for the TI J7 HS EVM (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "j721e" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "hs" + +UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/bsp/meta-ti/conf/machine/j7-hs-evm.conf b/bsp/meta-ti/conf/machine/j7-hs-evm.conf new file mode 100644 index 00000000..70e14754 --- /dev/null +++ b/bsp/meta-ti/conf/machine/j7-hs-evm.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: J7 HS EVM +#@DESCRIPTION: Machine configuration for the TI J7 HS EVM + +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}" + +TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" diff --git a/bsp/meta-ti/conf/machine/omap3evm.conf b/bsp/meta-ti/conf/machine/omap3evm.conf index a7457c04..01808b68 100644 --- a/bsp/meta-ti/conf/machine/omap3evm.conf +++ b/bsp/meta-ti/conf/machine/omap3evm.conf @@ -7,7 +7,7 @@ require conf/machine/include/omap3.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_FEATURES += "touchscreen ethernet" -IMAGE_FSTYPES += "jffs2 tar.gz" +IMAGE_FSTYPES += "jffs2 tar.xz" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" SERIAL_CONSOLES = "115200;ttyS0" diff --git a/bsp/meta-ti/conf/machine/omap5-evm.conf b/bsp/meta-ti/conf/machine/omap5-evm.conf index 28044cb9..b4cec1a2 100644 --- a/bsp/meta-ti/conf/machine/omap5-evm.conf +++ b/bsp/meta-ti/conf/machine/omap5-evm.conf @@ -4,7 +4,7 @@ require conf/machine/include/omap-a15.inc -IMAGE_FSTYPES += "ubi tar.gz" +IMAGE_FSTYPES += "ubi tar.xz" KERNEL_DEVICETREE = "omap5-uevm.dtb" diff --git a/bsp/meta-ti/conf/machine/omapl137-evm.conf b/bsp/meta-ti/conf/machine/omapl137-evm.conf index a8039f31..207b213a 100644 --- a/bsp/meta-ti/conf/machine/omapl137-evm.conf +++ b/bsp/meta-ti/conf/machine/omapl137-evm.conf @@ -6,7 +6,7 @@ require conf/machine/include/davinci.inc require conf/machine/include/omapl137.inc # HACK: The omapl137 family does not have linux kernel support. -PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy" EXTRA_IMAGEDEPENDS = "" IMAGE_FSTYPES = "tar.xz" diff --git a/bsp/meta-ti/conf/machine/pandaboard.conf b/bsp/meta-ti/conf/machine/pandaboard.conf index edfc612b..4dd6fa29 100644 --- a/bsp/meta-ti/conf/machine/pandaboard.conf +++ b/bsp/meta-ti/conf/machine/pandaboard.conf @@ -6,7 +6,7 @@ require conf/machine/include/omap4.inc MACHINE_GUI_CLASS = "bigscreen" -IMAGE_FSTYPES += "tar.gz" +IMAGE_FSTYPES += "tar.xz" KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb" diff --git a/bsp/meta-ti/conf/multiconfig/k3r5-sr2.conf b/bsp/meta-ti/conf/multiconfig/k3r5-sr2.conf new file mode 100644 index 00000000..17082141 --- /dev/null +++ b/bsp/meta-ti/conf/multiconfig/k3r5-sr2.conf @@ -0,0 +1,3 @@ +require k3r5.conf + +MACHINE_append = "-sr2" diff --git a/bsp/meta-ti/conf/multiconfig/k3r5.conf b/bsp/meta-ti/conf/multiconfig/k3r5.conf new file mode 100644 index 00000000..8c8f0c3f --- /dev/null +++ b/bsp/meta-ti/conf/multiconfig/k3r5.conf @@ -0,0 +1,5 @@ +MAINMACHINE := "${MACHINE}" + +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MAINMACHINE}" + +MACHINE_append = "-k3r5" diff --git a/bsp/meta-ti/licenses/Hewlett-Packard b/bsp/meta-ti/licenses/Hewlett-Packard new file mode 100644 index 00000000..569d009c --- /dev/null +++ b/bsp/meta-ti/licenses/Hewlett-Packard @@ -0,0 +1,13 @@ +/* + * Copyright (c) 1994 + * Hewlett-Packard Company + * + * Permission to use, copy, modify, distribute and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation. Hewlett-Packard Company makes no + * representations about the suitability of this software for any + * purpose. It is provided "as is" without express or implied warranty. + * + */ diff --git a/bsp/meta-ti/licenses/Patrick-Powell b/bsp/meta-ti/licenses/Patrick-Powell new file mode 100644 index 00000000..9c6eac42 --- /dev/null +++ b/bsp/meta-ti/licenses/Patrick-Powell @@ -0,0 +1,4 @@ +Copyright Patrick Powell 1995 +This code is based on code written by Patrick Powell (papowell@astart.com) +It may be used for any purpose as long as this notice remains intact +on all source code distributions diff --git a/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb b/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb index 12b1d06d..4a640f1b 100644 --- a/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/aif2-lld/aif2-lld_git.bb @@ -16,3 +16,5 @@ do_install () { oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} chown -R root:root ${D} } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libaif2.a" diff --git a/bsp/meta-ti/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb b/bsp/meta-ti/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb deleted file mode 100644 index f15570cf..00000000 --- a/bsp/meta-ti/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "ARM Trusted Firmware" -DESCRIPTION = "ARM Trusted Firmware provides a reference implementation of \ -Secure World software for ARMv8-A, including Exception Level 3 (EL3) software. \ -It provides implementations of various ARM interface standards such as the \ -Power State Coordination Interface (PSCI), Trusted Board Boot Requirements \ -(TBBR) and Secure monitor code." -HOMEPAGE = "http://infocenter.arm.com/help/topic/com.arm.doc.dui0928e/CJHIDGJF.html" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" - -inherit deploy - -DEPENDS += "dtc-native openssl-native" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git" - -PV_append = "+git${SRCPV}" - -BRANCH = "ti-atf" -SRC_URI = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH}" - -SRCREV ?= "e516a389ac12fbe1597f61fea80ed3f230b9c5fd" - -# Make ATF "aware" of OPTEE, no build dependency -PACKAGECONFIG[optee] = "SPD=opteed" - -COMPATIBLE_MACHINE = "k3" -ATFPLATFORM_k3 = "k3" -ATFBOARD_k3 = "generic" - -PACKAGECONFIG_k3 = "optee" - -CFLAGS[unexport] = "1" -LDFLAGS[unexport] = "1" -AS[unexport] = "1" -LD[unexport] = "1" - -do_configure[noexec] = "1" - -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" PLAT="${ATFPLATFORM}" TARGET_BOARD="${ATFBOARD}" ${PACKAGECONFIG_CONFARGS}' - -do_compile() { - oe_runmake all -} - -do_compile_append_am65xx-hs-evm() { - export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG} - ( cd ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/; \ - mv bl31.bin bl31.bin.unsigned; \ - ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \ - ) -} - -do_install() { - install -d ${D}/boot - install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31.bin ${D}/boot/ - install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31/bl31.elf ${D}/boot/ -} - -do_deploy() { - install -d ${DEPLOYDIR} - install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31.bin ${DEPLOYDIR}/ - install -m 0644 ${S}/build/${ATFPLATFORM}/${ATFBOARD}/release/bl31/bl31.elf ${DEPLOYDIR}/ -} -addtask deploy before do_build after do_compile - -FILES_${PN} = "/boot" -SYSROOT_DIRS += "/boot" diff --git a/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb b/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb index 99530d19..a6547d38 100644 --- a/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/board-rtos/board-rtos_git.bb @@ -56,9 +56,8 @@ DEPENDS_append_dra7xx = " pm-lld-rtos \ " DEPENDS_append_am65xx = " sciclient-rtos \ - pm-lld-rtos \ " -DEPENDS_append_j7-evm = " udma-lld-rtos \ +DEPENDS_append_j7 = " udma-lld-rtos \ sciclient-rtos \ mmcsd-lld-rtos \ " diff --git a/bsp/meta-ti/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/bsp/meta-ti/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb index 70c28671..6d857f7f 100644 --- a/bsp/meta-ti/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb +++ b/bsp/meta-ti/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb @@ -8,7 +8,7 @@ PR = "r0" CLEANBROKEN = "1" -COMPATIBLE_MACHINE = "j7-evm" +COMPATIBLE_MACHINE = "j7" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/bsp/meta-ti/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb b/bsp/meta-ti/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb index a10c4862..38f9a43e 100644 --- a/bsp/meta-ti/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb @@ -14,11 +14,11 @@ CMB_ADDON_GIT_PROTOCOL = "git" CMB_ADDON_GIT_BRANCH = "master" CMB_ADDON_GIT_DESTSUFFIX = "git/ti/addon" -# Below commit ID corresponds to "DEV.CMB.01.01.00.03" -CMB_ADDON_SRCREV = "4b16dd77eb929708a5134714c3194fc5b5bc1808" +# Below commit ID corresponds to "DEV.CMB.01.01.00.03A" +CMB_ADDON_SRCREV = "3655aad07f17d3a167ec7dcecb52450c1d2fe8be" SRCREV = "${CMB_ADDON_SRCREV}" -PV = "01.01.00.03" +PV = "01.01.00.03A" PR = "r0" BRANCH = "${CMB_ADDON_GIT_BRANCH}" diff --git a/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc b/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc index e728dbae..79e15f2d 100644 --- a/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc +++ b/bsp/meta-ti/recipes-bsp/common-csl-ip/common-csl-ip.inc @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21" COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1" -PV = "03.03.00.16B" +PV = "07.00.00.34" INC_PR = "r0" PE = "1" @@ -13,8 +13,8 @@ CSL_GIT_PROTOCOL ="git" CSL_GIT_BRANCH = "release" CSL_GIT_DESTSUFFIX = "git" -# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.16B" -CSL_SRCREV = "8a2d724e8ef850c32a7ba8e12f729ce611171469" +# Below commit ID corresponding to "REL.CORESDK.07.00.00.34" +CSL_SRCREV = "8d59814723070ce9bbc4137912b0aac80482ca8a" BRANCH="${CSL_GIT_BRANCH}" SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc b/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc index 40810f7f..77eaff25 100644 --- a/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc +++ b/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld.inc @@ -16,4 +16,4 @@ DEVICELIST = "k2h k2k k2l k2e" DEVICELIST_k2hk = "k2h k2k" DEVICELIST_k2l = "k2l" DEVICELIST_k2e = "k2e" - +DEVICELIST_k2g = "k2h" diff --git a/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld_git.bb b/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld_git.bb index 6ac72cfa..3cdcd22d 100644 --- a/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/cppi-lld/cppi-lld_git.bb @@ -30,3 +30,9 @@ do_install () { done ln -sf libcppi_device.so.1 libcppi_device.so } + +INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libcppi_k2h.a ${PKGD}${libdir}/libcppi_k2k.a" +INHIBIT_PACKAGE_STRIP_FILES_k2e = "${PKGD}${libdir}/libcppi_k2e.a" +INHIBIT_PACKAGE_STRIP_FILES_k2l = "${PKGD}${libdir}/libcppi_k2l.a" +INHIBIT_PACKAGE_STRIP_FILES_k2g = "${PKGD}${libdir}/libcppi_k2h.a" +INHIBIT_PACKAGE_STRIP_FILES_append = " ${PKGD}${libdir}/libcppi.a" diff --git a/bsp/meta-ti/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/bsp/meta-ti/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb index cbd71f2d..37ba52d0 100644..100755 --- a/bsp/meta-ti/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb +++ b/bsp/meta-ti/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb @@ -11,7 +11,7 @@ inherit update-alternatives PROTOCOL = "git" BRANCH = "master" -SRCREV = "4da71504488450f34d65459c1de949da1f984471" +SRCREV = "afe62ada2e91e2665f597ca16eb3888b752016de" SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" diff --git a/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld_git.bb b/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld_git.bb index 4456cc03..622da6fc 100644 --- a/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/dfe-lld/dfe-lld_git.bb @@ -16,3 +16,5 @@ do_install () { oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} chown -R root:root ${D} } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libdfe.a" diff --git a/bsp/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb b/bsp/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb index 2756c2d8..6ddbe683 100644 --- a/bsp/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb +++ b/bsp/meta-ti/recipes-bsp/dspdce-fw/dspdce-fw_git.bb @@ -1,9 +1,13 @@ -DESCRIPTION = "Firmware for DSP for an example application called copycodectest" +SUMMARY = "Firmware for DSP for an example application called copycodectest" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://src/ti/framework/dce/dce.c;startline=1;endline=31;md5=2c6e9aba6ed75f22b1a2b7544b1c809d" COMPATIBLE_MACHINE = "dra7xx" +inherit features_check + +REQUIRED_MACHINE_FEATURES = "dsp" + SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git" SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8" diff --git a/bsp/meta-ti/recipes-bsp/dsptop/libulm_git.bb b/bsp/meta-ti/recipes-bsp/dsptop/libulm_git.bb index 7bf7f090..47248ff1 100644 --- a/bsp/meta-ti/recipes-bsp/dsptop/libulm_git.bb +++ b/bsp/meta-ti/recipes-bsp/dsptop/libulm_git.bb @@ -1,7 +1,11 @@ -DESCRIPTION = "TI dsptop utility." +SUMMARY = "TI Usage & Load Monitor Implementation" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://../debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979" +inherit features_check + +REQUIRED_MACHINE_FEATURES = "dsp" + DEPENDS = "ti-cgt6x-native" PR = "${INC_PR}.0" diff --git a/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc b/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc index 34d3170f..ea33078d 100644 --- a/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc +++ b/bsp/meta-ti/recipes-bsp/edma3-lld/edma3-lld.inc @@ -6,8 +6,7 @@ EDMA3_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/edma3_lld.git" EDMA3_LLD_GIT_PROTOCOL = "git" EDMA3_LLD_GIT_BRANCH = "master" -# Below commit ID corresponds to version 2.12.05.30E -EDMA3_LLD_SRCREV = "ce5ced2ac5eb1e0f1515288d279f5690813b5413" +EDMA3_LLD_SRCREV = "1ac9a3ff6632d5f04403d8789c3f95e0b585f7ae" BRANCH = "${EDMA3_LLD_GIT_BRANCH}" SRC_URI = "${EDMA3_LLD_GIT_URI};protocol=${EDMA3_LLD_GIT_PROTOCOL};branch=${BRANCH}" diff --git a/bsp/meta-ti/recipes-bsp/fvid2/fvid2-rtos_git.bb b/bsp/meta-ti/recipes-bsp/fvid2/fvid2-rtos_git.bb index db1f9e1c..6219f0b3 100755..100644 --- a/bsp/meta-ti/recipes-bsp/fvid2/fvid2-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/fvid2/fvid2-rtos_git.bb @@ -28,9 +28,8 @@ export PDK_FVID2_ROOT_PATH = "${FVID2_PACKAGE_BASE}/package/all/pdk_/packages" BOARD_PACKAGE = "" -BOARD_PACKAGE_am65xx-evm = "am65xx_evm" -BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm" -BOARD_PACKAGE_j7-evm = "j721e_evm" +BOARD_PACKAGE_am65xx = "am65xx_evm" +BOARD_PACKAGE_j7 = "j721e_evm" # HTML doc link params PDK_COMP_LINK_TEXT = "FVID2" diff --git a/bsp/meta-ti/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb b/bsp/meta-ti/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb index 5f005e57..77bb0926 100644 --- a/bsp/meta-ti/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb +++ b/bsp/meta-ti/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb @@ -3,15 +3,17 @@ HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver" LICENSE = "MIT | GPLv2" LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297" -inherit module +inherit module features_check -MACHINE_KERNEL_PR_append = "e" +REQUIRED_MACHINE_FEATURES = "gc320" + +MACHINE_KERNEL_PR_append = "h" PR = "${MACHINE_KERNEL_PR}" # Need to branch out with ${PV} var -BRANCH = "ti-${PV}-k4.19" +BRANCH = "ti-${PV}-k5.4" -SRCREV = "9b59e596b4adefabbb686ce8845edef8114558fd" +SRCREV = "2a4fbe8353fa56011a613aeeaf69e274cd07a825" SRC_URI = "git://git.ti.com/graphics/ti-gc320-driver.git;protocol=git;branch=${BRANCH}" diff --git a/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb b/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb index 08124d7c..7848df1d 100644 --- a/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/hyplnk-lld/hyplnk-lld_git.bb @@ -31,3 +31,6 @@ do_install () { done ln -sf libhyplnk_device.so.1 libhyplnk_device.so } + +INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libhyplnk_k2h.a ${PKGD}${libdir}/libhyplnk_k2k.a" +INHIBIT_PACKAGE_STRIP_FILES_k2e = "${PKGD}${libdir}/libhyplnk_k2e.a" diff --git a/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb index 1cd1c998..5a3c1d64 100644 --- a/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/i2c-lld/i2c-lld-rtos_git.bb @@ -29,7 +29,7 @@ DEPENDS_append_am57xx-evm = " pruss-lld-rtos \ DEPENDS_append_k2g = " pruss-lld-rtos \ " -DEPENDS_append_j7-evm = " sciclient-rtos \ +DEPENDS_append_j7 = " sciclient-rtos \ " # Build with make instead of XDC diff --git a/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc b/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc index db205a99..e315c897 100644 --- a/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc +++ b/bsp/meta-ti/recipes-bsp/icss-emac-lld/icss-emac-lld.inc @@ -12,3 +12,4 @@ PE = "1" INC_PR = "r1" +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libicss_emac.a" diff --git a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb index fa3ea89d..79e5bdb9 100644 --- a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-examples-rtos_git.bb @@ -12,22 +12,29 @@ REMOTE_FWB_BIN_DIR = "${REMOTE_FW_DIR}/ipc_echo_testb/bin" RTOS_ALL_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex02_bios_multicore_echo_test/bin" RTOS_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex01_bios_2core_echo_test/bin" LINUX_2_CORES_BIN_DIR = "${REMOTE_FW_DIR}/ex03_linux_bios_2core_echo_test/bin" +LINUX_2_CORES_BAREMETAL_BIN_DIR = "${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin" DST_BIN_PATH = "${base_libdir}/firmware/pdk-ipc" -TI_PDK_LIMIT_BOARDS_j7-evm = "j721e_evm" +TI_PDK_LIMIT_BOARDS_j7 = "j721e_evm" do_configure[noexec] = "1" do_compile() { - cd ${S} + cd "${PDK_INSTALL_PATH}/ti/build" for board in ${TI_PDK_LIMIT_BOARDS} do for core in ${TI_PDK_LIMIT_CORES} do - oe_runmake examples BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} + oe_runmake ipc_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} + oe_runmake ex02_bios_multicore_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} + oe_runmake ex01_bios_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} + oe_runmake ex03_linux_bios_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} + oe_runmake ex04_linux_baremetal_2core_echo_test BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} + oe_runmake ipc_echo_testb BOARD="$board" CORE="$core" DEST_ROOT=${REMOTE_FW_DIR} done + done } @@ -55,7 +62,7 @@ do_install() { done } -do_install_append_j7-evm() { +do_install_append_j7() { #copy ipc_echo_testb binaries for J721 install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_0_release.xer5f ${D}${DST_BIN_PATH} install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu1_1_release.xer5f ${D}${DST_BIN_PATH} @@ -72,13 +79,16 @@ do_install_append_j7-evm() { install -m 0644 ${REMOTE_FWB_BIN_DIR}/$board/ipc_echo_testb_mcu3_1_release_strip.xer5f ${D}${DST_BIN_PATH} } +do_install_append_am65xx() { + cp ${CP_ARGS} ${REMOTE_FW_DIR}/ex04_linux_baremetal_2core_echo_test/bin -d ${D}/ex04_linux_baremetal_2core_echo_test +} # Set up names for the firmwares ALTERNATIVE_${PN}_am65xx = "\ am65x-mcu-r5f0_0-fw \ am65x-mcu-r5f0_1-fw \ " -ALTERNATIVE_${PN}_j7-evm = "\ +ALTERNATIVE_${PN}_j7 = "\ j7-mcu-r5f0_0-fw \ j7-mcu-r5f0_1-fw \ j7-main-r5f0_0-fw \ @@ -95,15 +105,15 @@ ALTERNATIVE_${PN}_j7-evm = "\ TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw" -TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw" -TARGET_C66_0_j7-evm = "j7-c66_0-fw" -TARGET_C66_1_j7-evm = "j7-c66_1-fw" -TARGET_C7X_j7-evm = "j7-c71_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" +TARGET_MAIN_R5FSS0_1_j7 = "j7-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0_j7 = "j7-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1_j7 = "j7-main-r5f1_1-fw" +TARGET_C66_0_j7 = "j7-c66_0-fw" +TARGET_C66_1_j7 = "j7-c66_1-fw" +TARGET_C7X_j7 = "j7-c71_0-fw" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" @@ -144,6 +154,7 @@ FILES_${PN} += "${base_libdir}/firmware" FILES_${PN}-rtos += "ex02_bios_multicore_echo_test" FILES_${PN}-rtos += "ex01_bios_2core_echo_test" FILES_${PN}-rtos += "ex03_linux_bios_2core_echo_test" +FILES_${PN}-rtos += "ex04_linux_baremetal_2core_echo_test" INSANE_SKIP_${PN} = "arch ldflags file-rdeps" INSANE_SKIP_${PN}-rtos = "arch ldflags file-rdeps" diff --git a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb index df992762..1be28365 100644 --- a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb +++ b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld-fw_git.bb @@ -23,7 +23,7 @@ AM65X_R5_FW_DIR = "${S}/examples/echo_test/binaries/am65xx" J721E_R5_DSP_FW_DIR = "${S}/examples/echo_test/binaries/j721e" PLATFORM_am65xx = "am65xx" -PLATFORM_j7-evm = "j7-evm" +PLATFORM_j7 = "j7-evm" # make sure that lib/firmware, and all its contents are part of the package FILES_${PN} += "${base_libdir}/firmware" @@ -40,7 +40,7 @@ do_install_append_am65xx() { install -m 0644 ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ } -do_install_append_j7-evm() { +do_install_append_j7() { install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ install -m 0644 ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${D}${base_libdir}/firmware/pdk-ipc/ @@ -78,7 +78,7 @@ ALTERNATIVE_${PN}_am65xx = "\ am65x-mcu-r5f0_0-fw \ am65x-mcu-r5f0_1-fw \ " -ALTERNATIVE_${PN}_j7-evm = "\ +ALTERNATIVE_${PN}_j7 = "\ j7-mcu-r5f0_0-fw \ j7-mcu-r5f0_1-fw \ j7-main-r5f0_0-fw \ @@ -95,15 +95,15 @@ ALTERNATIVE_${PN}_j7-evm = "\ TARGET_MCU_R5FSS0_0_am65xx = "am65x-mcu-r5f0_0-fw" TARGET_MCU_R5FSS0_1_am65xx = "am65x-mcu-r5f0_1-fw" -TARGET_MCU_R5FSS0_0_j7-evm = "j7-mcu-r5f0_0-fw" -TARGET_MCU_R5FSS0_1_j7-evm = "j7-mcu-r5f0_1-fw" -TARGET_MAIN_R5FSS0_0_j7-evm = "j7-main-r5f0_0-fw" -TARGET_MAIN_R5FSS0_1_j7-evm = "j7-main-r5f0_1-fw" -TARGET_MAIN_R5FSS1_0_j7-evm = "j7-main-r5f1_0-fw" -TARGET_MAIN_R5FSS1_1_j7-evm = "j7-main-r5f1_1-fw" -TARGET_C66_0_j7-evm = "j7-c66_0-fw" -TARGET_C66_1_j7-evm = "j7-c66_1-fw" -TARGET_C7X_j7-evm = "j7-c71_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" +TARGET_MAIN_R5FSS0_1_j7 = "j7-main-r5f0_1-fw" +TARGET_MAIN_R5FSS1_0_j7 = "j7-main-r5f1_0-fw" +TARGET_MAIN_R5FSS1_1_j7 = "j7-main-r5f1_1-fw" +TARGET_C66_0_j7 = "j7-c66_0-fw" +TARGET_C66_1_j7 = "j7-c66_1-fw" +TARGET_C7X_j7 = "j7-c71_0-fw" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}" ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}" @@ -148,7 +148,7 @@ do_deploy_am65xx() { install ${AM65X_R5_FW_DIR}/ipc_echo_test_mcu1_1_release.strip.xer5f ${DEPLOYDIR}/ } -do_deploy_j7-evm() { +do_deploy_j7() { install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.xer5f ${DEPLOYDIR}/ install ${J721E_R5_DSP_FW_DIR}/ipc_echo_test_mcu1_0_release.strip.xer5f ${DEPLOYDIR}/ install ${J721E_R5_DSP_FW_DIR}/ipc_echo_testb_mcu1_0_release.xer5f ${DEPLOYDIR}/ diff --git a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld.inc b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld.inc index 66bbf321..2aea055f 100644 --- a/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld.inc +++ b/bsp/meta-ti/recipes-bsp/ipc-lld/ipc-lld.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7eae093f2b09fd39307f30028a068b91" COMPATIBLE_MACHINE = "k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r2" +PR = "r4" # Build with make instead of XDC TI_PDK_XDCMAKE = "0" diff --git a/bsp/meta-ti/recipes-bsp/ipumm-fw/files/0001-HACK-ipumm-Workaround-for-linker-error.patch b/bsp/meta-ti/recipes-bsp/ipumm-fw/files/0001-HACK-ipumm-Workaround-for-linker-error.patch new file mode 100644 index 00000000..0bea358f --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ipumm-fw/files/0001-HACK-ipumm-Workaround-for-linker-error.patch @@ -0,0 +1,48 @@ +From 7226700841c62e6a42690eaa8b3e31b2c329b341 Mon Sep 17 00:00:00 2001 +From: Ramprasad N <x0038811@ti.com> +Date: Thu, 28 May 2020 09:53:59 +0530 +Subject: [PATCH] HACK: ipumm: Workaround for linker error + +* HACK: ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__E is no longer +* defined with latest XDC tools. To temporarily get around the issue +* until the real fix can be made, dummy defination of the missing function +* is added in ipu_main.c + +*IPUMM dependent tool chain components are upgraded to latest version +* BIOS : 6_82_01_17_eng +* XDC : 3_61_00_16_core +* This issue is seen only with xdc tools upgrade. + +Signed-off-by: Angela Stegmaier <angelabaker@ti.com> +Signed-off-by: Ramprasad N <x0038811@ti.com> +--- + platform/ti/dce/baselib/ipumm_main.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/platform/ti/dce/baselib/ipumm_main.c b/platform/ti/dce/baselib/ipumm_main.c +index 76ccd34..f4ca6e5 100644 +--- a/platform/ti/dce/baselib/ipumm_main.c ++++ b/platform/ti/dce/baselib/ipumm_main.c +@@ -50,6 +50,19 @@ + #include <string.h> + #include <stdlib.h> + ++/* ++ * HACK: ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__E is no longer ++ * defined with latest XDC tools. To temporarily get around the issue ++ * until the real fix can be made, define the missing function ++ * here. ++ */ ++extern ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__F(xdc_Int state); ++ ++/* Module_startup */ ++xdc_Int ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__E( xdc_Int state ) ++{ ++ return ti_sdo_ce_utils_syscbuf_SysCBuf_Module_startup__F(state); ++} + + /* Legacy function to allow Linux side rpmsg sample tests to work: */ + extern void start_ping_tasks(); +-- +1.9.1 + diff --git a/bsp/meta-ti/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/bsp/meta-ti/recipes-bsp/ipumm-fw/ipumm-fw_git.bb index 5cb38b05..e53d0a98 100644 --- a/bsp/meta-ti/recipes-bsp/ipumm-fw/ipumm-fw_git.bb +++ b/bsp/meta-ti/recipes-bsp/ipumm-fw/ipumm-fw_git.bb @@ -1,28 +1,28 @@ -python __anonymous() { - features = d.getVar("MACHINE_FEATURES") - if not features: - return - if "mmip" not in features: - raise bb.parse.SkipPackage('ipumm-fw does not apply to systems without the "mmip" flag in MACHINE_FEATURES') -} - -DESCRIPTION = "Firmware for IPU for supporting Accelerated MM decode and encode" +SUMMARY = "Firmware for IPU to suppor Accelerated MM decode and encode" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://Texas_Instruments_ipumm_Manifest.pdf;md5=5cc572579f07af266ab57fc17d762c7f" COMPATIBLE_MACHINE = "dra7xx" -RDEPENDS_${PN} = " libdce" +inherit features_check + +REQUIRED_MACHINE_FEATURES = "mmip" + +RDEPENDS_${PN} = "libdce" SRC_URI = "git://git.ti.com/ivimm/ipumm.git;protocol=git" -SRCREV = "e4872a8966a267d537399b1babc54e5f66ae8b3b" +SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" + +SRC_URI += " \ + file://0001-HACK-ipumm-Workaround-for-linker-error.patch \ + " S = "${WORKDIR}/git" PV = "3.00.15.00" -PR = "r4" +PR = "r6" require recipes-ti/includes/ti-paths.inc diff --git a/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld_git.bb b/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld_git.bb index 169ab6e4..a0c2ef87 100644 --- a/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/iqn2-lld/iqn2-lld_git.bb @@ -21,3 +21,5 @@ do_install () { oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} chown -R root:root ${D} } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libiqn2.a" diff --git a/bsp/meta-ti/recipes-bsp/ivshmem-uio/ivshmem-uio-tests_git.bb b/bsp/meta-ti/recipes-bsp/ivshmem-uio/ivshmem-uio-tests_git.bb new file mode 100644 index 00000000..997b8c48 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ivshmem-uio/ivshmem-uio-tests_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "UIO tests for IVSHMEM based UIO driver" +DESCRIPTION = "Test programs which use UIO (userspace io) device for inter VM communication" +HOMEPAGE = "https://github.com/henning-schild-work/ivshmem-guest-code" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/COPYING;md5=0546a27aad86c83b75ad4ee6133e9d5e" + +inherit cmake + +PROTOCOL = "git" +BRANCH = "jailhouse" +SRCREV = "f3ad79881bebb6c6068966ee3d265d8034c20492" +SRC_URI = "git://github.com/henning-schild-work/ivshmem-guest-code.git;protocol=${PROTOCOL};branch=${BRANCH}" + +S = "${WORKDIR}/git/uio/tests/Interrupts/VM" + +COMPATIBLE_MACHINE = "(ti-soc)" +OECMAKE_TARGET_COMPILE = "uio_send uio_read" + +do_install() { + install -d ${D}/${bindir} + install -m 755 ${B}/uio_send ${D}/${bindir}/ + install -m 755 ${B}/uio_read ${D}/${bindir}/ +} diff --git a/bsp/meta-ti/recipes-bsp/osal/osal.inc b/bsp/meta-ti/recipes-bsp/osal/osal.inc index 1f0a0778..e2143e13 100644 --- a/bsp/meta-ti/recipes-bsp/osal/osal.inc +++ b/bsp/meta-ti/recipes-bsp/osal/osal.inc @@ -12,3 +12,4 @@ PE = "1" INC_PR = "r0" +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libosal.a" diff --git a/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc b/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc index 83c57e31..e8e07318 100644 --- a/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc +++ b/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld.inc @@ -1,7 +1,7 @@ LICENSE = "BSD-3-Clause & TI-TFL" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/pa/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871" -COMPATIBLE_MACHINE = "keystone" +COMPATIBLE_MACHINE = "k2hk|k2e|k2l" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit ti-pdk-fetch diff --git a/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld_git.bb b/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld_git.bb index f636ce4a..bbe7aa31 100644 --- a/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/pa-lld/pa-lld_git.bb @@ -22,3 +22,6 @@ do_install () { ln -sf ${LIBPA}.so.1.0.0 ${D}${libdir}/libpa_device.so.1 ln -sf libpa_device.so.1 ${D}${libdir}/libpa_device.so } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libpa2.a" +INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libpa.a" diff --git a/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb b/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb index 5db670e3..25fcb65e 100644 --- a/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/pm-lld/pm-lld-rtos_git.bb @@ -20,8 +20,8 @@ PM_LLD_GIT_BRANCH_k2g = "int_pm_am335x" PM_LLD_GIT_DESTSUFFIX = "git/ti/drv/pm" -# Below commit ID corresponds to "DEV.PM_LLD.01.08.00.23" -PM_LLD_SRCREV = "7c064b93a0ae648441991abb5c71b99d2c209eeb" +# Below commit ID corresponds to "DEV.PM_LLD.01.08.00.23A" +PM_LLD_SRCREV = "59abc6ffb890d24b82de0248d204ad10c1bfc2af" # Below commit ID corresponds to "DEV.PM_LLD.01.04.00.05C" PM_LLD_SRCREV_ti33x = "dd1f8486e7738956631b7f4829c8238be2e49dd6" @@ -32,7 +32,7 @@ BRANCH = "${PM_LLD_GIT_BRANCH}" SRC_URI = "${PM_LLD_GIT_URI};destsuffix=${PM_LLD_GIT_DESTSUFFIX};protocol=${PM_LLD_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${PM_LLD_SRCREV}" -PV = "01.08.00.23" +PV = "01.08.00.23A" PR = "r0" S = "${WORKDIR}/${PM_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb index 2f4b7ac5..da4ec6e6 100644 --- a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb +++ b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.10.5371573.bb @@ -3,26 +3,28 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" LICENSE = "MIT | GPLv2" LIC_FILES_CHKSUM = "file://README;beginline=15;endline=20;md5=0403c7dea01a2b8232261e805325fac2" -inherit module +inherit module features_check -MACHINE_KERNEL_PR_append = "e" +REQUIRED_MACHINE_FEATURES = "gpu" + +MACHINE_KERNEL_PR_append = "f" PR = "${MACHINE_KERNEL_PR}" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7-evm" +COMPATIBLE_MACHINE = "j7" DEPENDS = "virtual/kernel" PROVIDES = "virtual/gpudriver" -BRANCH = "linuxws/thud/k4.19/${PV}" +BRANCH = "linuxws/zeus/k5.4/${PV}" SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ file://0001-km-support-general-toolchain.patch \ " S = "${WORKDIR}/git" -SRCREV = "fe40a51f33987c59aca300f8a976a9a9c8112703" +SRCREV = "e0bc128ee5098e30c9fb096634ba6bec01b5fc17" PVR_SOC = "j721e_linux" PVR_BVNC = "22.104.208.318" @@ -32,5 +34,5 @@ PVR_WS = "wayland" EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' do_install() { - make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install + make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install } diff --git a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index 5c1a50de..734e780e 100644 --- a/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/bsp/meta-ti/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -3,11 +3,13 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux" LICENSE = "MIT | GPLv2" LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9b8e5edbce66c2747c50fcef12" -inherit module +inherit module features_check -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +REQUIRED_MACHINE_FEATURES = "gpu" -MACHINE_KERNEL_PR_append = "s" +COMPATIBLE_MACHINE = "pandaboard|beagleboard|ti33x|ti43x|omap-a15|k3" + +MACHINE_KERNEL_PR_append = "v" PR = "${MACHINE_KERNEL_PR}" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -16,7 +18,7 @@ DEPENDS = "virtual/kernel" PROVIDES = "virtual/gpudriver" -BRANCH = "ti-img-sgx/${PV}/k4.19" +BRANCH = "ti-img-sgx/${PV}/k5.4" SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH} \ file://0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch \ @@ -24,12 +26,14 @@ SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch S = "${WORKDIR}/git" -SRCREV = "4519ed3b83d1d72207ddc2874c7eb5e5a7f20d8d" +SRCREV = "50c1ec2308b9f64488d252ac55d65b51a0dfe287" TARGET_PRODUCT_omap-a15 = "jacinto6evm" TARGET_PRODUCT_ti33x = "ti335x" TARGET_PRODUCT_ti43x = "ti437x" TARGET_PRODUCT_k3 = "ti654x" +TARGET_PRODUCT_beagleboard = "ti343x" +TARGET_PRODUCT_pandaboard = "ti443x" EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=nulldrmws' @@ -38,9 +42,9 @@ do_compile_prepend() { } do_install() { - make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_armhf/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install + make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_armhf/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install } do_install_k3() { - make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install + make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install } diff --git a/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb b/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb index 88d28f37..23097d97 100644 --- a/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb +++ b/bsp/meta-ti/recipes-bsp/pru/pru-icss_git.bb @@ -1,17 +1,17 @@ DESCRIPTION = "Programmable Real-time Unit Software Package" HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS" -LICENSE = "BSD-3-Clause & GPL-2.0 & PD" +LICENSE = "BSD-3-Clause & PD" -LIC_FILES_CHKSUM = "file://PRU-Package-v6.0-Manifest.html;md5=ea854230556f47609efdaedca174b44c" +LIC_FILES_CHKSUM = "file://PRU-Package-v6.1-Manifest.html;md5=1e37797ebe9254922f4278bb6047211c" inherit update-alternatives BRANCH = "master" SRC_URI = "git://git.ti.com/pru-software-support-package/pru-software-support-package.git;protocol=git;branch=${BRANCH}" -SRCREV = "ff252a5e174f1b6aa42931744939f20d25d8e070" +SRCREV = "a9bff6f43001cf66dc1ed3ef7e9dfb688b67f7bb" -PV = "5.6.0" -PR = "r1" +PV = "5.7.0" +PR = "r0" require recipes-ti/includes/ti-paths.inc @@ -42,7 +42,7 @@ PLATFORM_ti43x = "am437x" PLATFORM_omap-a15 = "am572x" PLATFORM_k2g = "k2g" PLATFORM_am65xx = "am65x" -PLATFORM_j7-evm = "j721e" +PLATFORM_j7 = "j721e" do_compile() { for dir in ${SUBDIRS} @@ -119,6 +119,8 @@ do_install_append_am65xx() { ${D}/lib/firmware/pru install -m 644 ${S}/examples/${PLATFORM}/RTU_Halt/gen/RTU${i}/RTU_Halt_${i}.out \ ${D}/lib/firmware/pru + install -m 644 ${S}/examples/${PLATFORM}/TX_PRU_Halt/gen/TX_PRU${i}/TX_PRU_Halt_${i}.out \ + ${D}/lib/firmware/pru done for i in 0 1 2 do @@ -133,7 +135,7 @@ do_install_append_am65xx() { done } -do_install_append_j7-evm() { +do_install_append_j7() { for i in 0 1 do install -m 644 ${S}/examples/${PLATFORM}/PRU_Halt/gen/PRU${i}/PRU_Halt_${i}.out \ @@ -166,7 +168,7 @@ PRU_ICSS_ALTERNATIVES_ti43x = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_ PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw" PRU_ICSS_ALTERNATIVES_k2g = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw" PRU_ICSS_ALTERNATIVES_am65xx = "am65x-pru0_0-fw am65x-pru0_1-fw am65x-pru1_0-fw am65x-pru1_1-fw am65x-pru2_0-fw am65x-pru2_1-fw am65x-rtu0_0-fw am65x-rtu0_1-fw am65x-rtu1_0-fw am65x-rtu1_1-fw am65x-rtu2_0-fw am65x-rtu2_1-fw" -PRU_ICSS_ALTERNATIVES_j7-evm = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw" +PRU_ICSS_ALTERNATIVES_j7 = "j7-pru0_0-fw j7-pru0_1-fw j7-pru1_0-fw j7-pru1_1-fw j7-rtu0_0-fw j7-rtu0_1-fw j7-rtu1_0-fw j7-rtu1_1-fw" # Set up link names for the firmwares ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw" @@ -199,6 +201,12 @@ ALTERNATIVE_LINK_NAME[am65x-rtu1_0-fw] = "/lib/firmware/am65x-rtu1_0-fw" ALTERNATIVE_LINK_NAME[am65x-rtu1_1-fw] = "/lib/firmware/am65x-rtu1_1-fw" ALTERNATIVE_LINK_NAME[am65x-rtu2_0-fw] = "/lib/firmware/am65x-rtu2_0-fw" ALTERNATIVE_LINK_NAME[am65x-rtu2_1-fw] = "/lib/firmware/am65x-rtu2_1-fw" +ALTERNATIVE_LINK_NAME[am65x-txpru0_0-fw] = "/lib/firmware/am65x-txpru0_0-fw" +ALTERNATIVE_LINK_NAME[am65x-txpru0_1-fw] = "/lib/firmware/am65x-txpru0_1-fw" +ALTERNATIVE_LINK_NAME[am65x-txpru1_0-fw] = "/lib/firmware/am65x-txpru1_0-fw" +ALTERNATIVE_LINK_NAME[am65x-txpru1_1-fw] = "/lib/firmware/am65x-txpru1_1-fw" +ALTERNATIVE_LINK_NAME[am65x-txpru2_0-fw] = "/lib/firmware/am65x-txpru2_0-fw" +ALTERNATIVE_LINK_NAME[am65x-txpru2_1-fw] = "/lib/firmware/am65x-txpru2_1-fw" ALTERNATIVE_LINK_NAME[j7-pru0_0-fw] = "/lib/firmware/j7-pru0_0-fw" ALTERNATIVE_LINK_NAME[j7-pru0_1-fw] = "/lib/firmware/j7-pru0_1-fw" @@ -217,7 +225,8 @@ ALTERNATIVE_LINK_NAME[j7-txpru1_1-fw] = "/lib/firmware/j7-txpru1_1-fw" ALTERNATIVE_pru-icss-halt = "${PRU_ICSS_ALTERNATIVES}" # Only Halt firmware images are supported for the Tx_PRU cores -ALTERNATIVE_pru-icss-halt_append_j7-evm = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw" +ALTERNATIVE_pru-icss-halt_append_am65xx = " am65x-txpru0_0-fw am65x-txpru0_1-fw am65x-txpru1_0-fw am65x-txpru1_1-fw am65x-txpru2_0-fw am65x-txpru2_1-fw" +ALTERNATIVE_pru-icss-halt_append_j7 = " j7-txpru0_0-fw j7-txpru0_1-fw j7-txpru1_0-fw j7-txpru1_1-fw" ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru0-fw] = "/lib/firmware/pru/PRU_Halt.out" ALTERNATIVE_TARGET_pru-icss-halt[am335x-pru1-fw] = "/lib/firmware/pru/PRU_Halt.out" @@ -249,6 +258,12 @@ ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_0-fw] = "/lib/firmware/pru/RTU_Halt_ ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu1_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out" ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_0-fw] = "/lib/firmware/pru/RTU_Halt_0.out" ALTERNATIVE_TARGET_pru-icss-halt[am65x-rtu2_1-fw] = "/lib/firmware/pru/RTU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru0_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru0_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru1_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru1_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out" +ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru2_0-fw] = "/lib/firmware/pru/TX_PRU_Halt_0.out" +ALTERNATIVE_TARGET_pru-icss-halt[am65x-txpru2_1-fw] = "/lib/firmware/pru/TX_PRU_Halt_1.out" ALTERNATIVE_TARGET_pru-icss-halt[j7-pru0_0-fw] = "/lib/firmware/pru/PRU_Halt_0.out" ALTERNATIVE_TARGET_pru-icss-halt[j7-pru0_1-fw] = "/lib/firmware/pru/PRU_Halt_1.out" diff --git a/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb new file mode 100644 index 00000000..6e17c4aa --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "PRU Ethernet firmware for AM65xx SR2.0" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" + +PV = "2.2.0.1+2.2.0.2-rc1" + +CLEANBROKEN = "1" + +COMPATIBLE_MACHINE = "am65xx-evm" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRCREV = "ea4bf53ba0a4a30bb7e0e8b6138fdb22fe50372a" +BRANCH ?= "ti-linux-firmware" + +SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}" + +S = "${WORKDIR}/git" + +TARGET = " \ + am65x-sr2-pru0-prueth-fw.elf \ + am65x-sr2-pru1-prueth-fw.elf \ + am65x-sr2-rtu0-prueth-fw.elf \ + am65x-sr2-rtu1-prueth-fw.elf \ + am65x-sr2-txpru0-prueth-fw.elf \ + am65x-sr2-txpru1-prueth-fw.elf \ +" + +do_install() { + install -d ${D}${base_libdir}/firmware/ti-pruss + for f in ${TARGET}; do + install -m 0644 ${S}/ti-pruss/$f ${D}${base_libdir}/firmware/ti-pruss/$f + done +} + +FILES_${PN} = "${base_libdir}/firmware" + +INSANE_SKIP_${PN} = "arch" diff --git a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc index 793ba838..fe5987a4 100644 --- a/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc +++ b/bsp/meta-ti/recipes-bsp/pruss-lld/pruss-lld.inc @@ -12,3 +12,4 @@ PE = "1" INC_PR = "r0" +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libpruss.a" diff --git a/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc b/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc index 5c9620f9..108383d4 100644 --- a/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc +++ b/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld.inc @@ -16,4 +16,4 @@ DEVICELIST = "k2h k2k k2l k2e" DEVICELIST_k2hk = "k2h k2k" DEVICELIST_k2l = "k2l" DEVICELIST_k2e = "k2e" - +DEVICELIST_k2g = "k2h" diff --git a/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld_git.bb b/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld_git.bb index a87f4905..04f82d98 100644 --- a/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/qmss-lld/qmss-lld_git.bb @@ -30,3 +30,9 @@ do_install () { done ln -sf libqmss_device.so.1 libqmss_device.so } + +INHIBIT_PACKAGE_STRIP_FILES_k2hk = "${PKGD}${libdir}/libqmss_k2h.a ${PKGD}${libdir}/libqmss_k2k.a" +INHIBIT_PACKAGE_STRIP_FILES_k2e = "${PKGD}${libdir}/libqmss_k2e.a" +INHIBIT_PACKAGE_STRIP_FILES_k2l = "${PKGD}${libdir}/libqmss_k2l.a" +INHIBIT_PACKAGE_STRIP_FILES_k2g = "${PKGD}${libdir}/libqmss_k2h.a" +INHIBIT_PACKAGE_STRIP_FILES_append = " ${PKGD}${libdir}/libqmss.a" diff --git a/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld_git.bb b/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld_git.bb index ae79a34c..e2701d04 100644 --- a/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/rm-lld/rm-lld_git.bb @@ -29,3 +29,5 @@ do_install () { make -f makefile_armv7 install installbin installbin_test INSTALL_INC_BASE_DIR=${D}${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir} INSTALL_BIN_BASE_DIR=${D}${bindir} chown -R root:root ${D} } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/librm.a" diff --git a/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.2.bb b/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.2.bb deleted file mode 100644 index 0545b0cc..00000000 --- a/bsp/meta-ti/recipes-bsp/rwmem/rwmem_1.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A small tool to read/write memory" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += "python3" - -PV .= "+git${SRCPV}" - -SRCREV_rwmem = "cc296c5366a35a4c4271cfa3cc9831f6f34bfd9d" -SRCREV_inih = "4b10c654051a86556dfdb634c891b6c3224c4109" -SRCREV_pybind11 = "9a19306fbf30642ca331d0ec88e7da54a96860f9" - -SRCREV_FORMAT = "rwmem_inih_pybind11" - -SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem \ - git://github.com/benhoyt/inih.git;protocol=https;name=inih;nobranch=1;destsuffix=git/ext/inih \ - git://github.com/pybind/pybind11.git;protocol=https;name=pybind11;nobranch=1;destsuffix=git/ext/pybind11 \ - " - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -do_install() { - install -D -m 0755 ${B}/bin/rwmem ${D}${bindir}/rwmem - install -D -m 0644 ${B}/lib/librwmem.a ${D}${libdir}/librwmem.a -} diff --git a/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc b/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc index 4eaa0f80..d4993cb9 100644 --- a/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc +++ b/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld.inc @@ -1,5 +1,5 @@ LICENSE = "BSD-3-Clause & TI-TFL" -COMPATIBLE_MACHINE = "keystone" +COMPATIBLE_MACHINE = "k2hk|k2e|k2l" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/sa/COPYING.txt;md5=cd04fb087063a2a82c4ce61983836871" @@ -8,14 +8,14 @@ SA_LLD_GIT_PROTOCOL = "git" SA_LLD_GIT_BRANCH = "master" SA_LLD_GIT_DESTSUFFIX = "git/ti/drv/sa" -# Below commit ID corresponding to "DEV.SA_LLD.04.00.00.03B" -SA_LLD_SRCREV = "ac85eea98ccb73fa00006afca8ae03536e933134" +# Below commit ID corresponding to "DEV.SA_LLD.04.00.00.03D" +SA_LLD_SRCREV = "506491b586c13c90f307b527df5eaacd35af6d02" BRANCH = "${SA_LLD_GIT_BRANCH}" SRC_URI = "${SA_LLD_GIT_URI};destsuffix=${SA_LLD_GIT_DESTSUFFIX};protocol=${SA_LLD_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${SA_LLD_SRCREV}" -PV = "04.00.00.03B" +PV = "04.00.00.03D" INC_PR = "r0" S = "${WORKDIR}/${SA_LLD_GIT_DESTSUFFIX}" diff --git a/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld_git.bb b/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld_git.bb index df41c653..a45fe1f7 100644 --- a/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld_git.bb +++ b/bsp/meta-ti/recipes-bsp/sa-lld/sa-lld_git.bb @@ -22,3 +22,5 @@ do_install () { ln -sf libsa.so.1.0.0 ${D}${libdir}/libsa_device.so.1 ln -sf libsa_device.so.1 ${D}${libdir}/libsa_device.so } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libsa.a" diff --git a/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb b/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb index d14c4a12..deaf0b12 100644 --- a/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb +++ b/bsp/meta-ti/recipes-bsp/sciclient/sciclient-rtos_git.bb @@ -7,12 +7,12 @@ TI_PDK_COMP = "ti.drv.sciclient" PE = "1" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://sciclient.h;beginline=1;endline=31;md5=7224b2eeca1444815f1737bfcdfa892a" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=99d7639a81c1ba1f16fd070a928ffddb" COMPATIBLE_MACHINE = "k3" PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r0" +PR = "r1" DEPENDS_append = " osal-rtos common-csl-ip-rtos openssl-native" @@ -25,6 +25,11 @@ SCICLIENT_ROOTPATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages" export PDK_SCICLIENT_ROOT_PATH = "${SCICLIENT_PACKAGE_BASE}/package/all/pdk_/packages" +BUILD_HS = "" +BUILD_HS_am65xx-hs-evm = "yes" +BUILD_HS_j7-hs-evm = "yes" +export BUILD_HS + # Sciclient for am65x supports mcu1_1 in addition to the default cores in TI_PDK_LIMIT_CORES TI_PDK_LIMIT_CORES_append_am65xx = " mcu1_1" @@ -95,6 +100,14 @@ do_compile_prepend_j7-evm() { cd - } +do_compile_prepend_j7-hs-evm() { + + cd ${SCICLIENT_ROOTPATH}/tools + # Create the .bin file for HS + ${SCICLIENT_ROOTPATH}/tools/firmwareHeaderGen.sh j721e-hs ${PDK_INSTALL_DIR}/packages + cd - +} + do_install() { cd ${SCICLIENT_ROOTPATH} install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/sciclient @@ -106,6 +119,7 @@ FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages" INSANE_SKIP_${PN} = "arch ldflags file-rdeps" INSANE_SKIP_${PN}-dbg = "arch" + +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/bsp/meta-ti/recipes-bsp/starterware/starterware.inc b/bsp/meta-ti/recipes-bsp/starterware/starterware.inc index ae098211..82b012ad 100644 --- a/bsp/meta-ti/recipes-bsp/starterware/starterware.inc +++ b/bsp/meta-ti/recipes-bsp/starterware/starterware.inc @@ -8,14 +8,14 @@ STARTERWARE_GIT_URI = "git://git.ti.com/keystone-rtos/starterware.git" STARTERWARE_GIT_PROTOCOL = "git" STARTERWARE_GIT_BRANCH = "master" -# Below commit ID corresponds to "DEV.STARTERWARE.PROCSDK.02.01.01.12" -STARTERWARE_SRCREV = "7f418b7471ca11ba4c6d91b4a7eb992a1dd55d7d" +# Below commit ID corresponds to "DEV.STARTERWARE.PROCSDK.02.01.01.12A" +STARTERWARE_SRCREV = "49a4d4cd4c72bacee738d44b8e72e7f59aa948cd" BRANCH = "${STARTERWARE_GIT_BRANCH}" SRC_URI = "${STARTERWARE_GIT_URI};protocol=${STARTERWARE_GIT_PROTOCOL};branch=${BRANCH}" SRCREV = "${STARTERWARE_SRCREV}" -PV = "02.01.01.12" +PV = "02.01.01.12A" INC_PR = "r0" S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb deleted file mode 100644 index a1da9585..00000000 --- a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/ti-img-encode-decode_1.0.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Kernel drivers for the IMG VXE384 MP2 and D5520 encoder/decoder found in TI SoCs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://driver/common/dq.c;beginline=1;endline=16;md5=e015e28ff5e88576dab9fdf641e3dbfe" - -inherit module - -MACHINE_KERNEL_PR_append = "g" -PR = "${MACHINE_KERNEL_PR}" - -COMPATIBLE_MACHINE = "j7-evm" - -SRCREV = "0eba3678300f649e49f03d92d1b624cf0e008008" - -EXTRA_OEMAKE = "KPATH=${STAGING_KERNEL_DIR} KCONF=${STAGING_KERNEL_BUILDDIR}" -TARGET_CC_ARCH += "${LDFLAGS}" - -BRANCH = "master" -SRC_URI = "git://git.ti.com/jacinto7_multimedia/ti-img-encode-decode.git;protocol=git;branch=${BRANCH}" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake all -C ${S}/linux/decoder - oe_runmake all -C ${S}/linux/encoder -} - -do_install() { - install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra - install -m 644 ${S}/linux/decoder/vxd-dec.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra - install -m 644 ${S}/linux/encoder/vxe-enc.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/extra -} diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb deleted file mode 100644 index 48a17537..00000000 --- a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Test applications for TI DEC (v4l2 decoder for IMG D5520)" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=f17e17d664f72942124e4fcf06c178ee" - -DEPENDS = "libdrm ffmpeg" - -inherit autotools pkgconfig - -PR = "r1" -SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2" - -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}" - -S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb deleted file mode 100644 index 3bb5d745..00000000 --- a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Test applications for TI ENC (v4l2 encoder for IMG VXE384)" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://main.c;beginline=1;endline=14;md5=3545dd5bdf513840937d38c10b866605" - -DEPENDS = "libdrm" - -inherit autotools pkgconfig - -PR = "r0" -SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a" - -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}" - -S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb b/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb deleted file mode 100644 index 2812fa2c..00000000 --- a/bsp/meta-ti/recipes-bsp/ti-img-encode-decode/vxd-dec-fw_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Video Decoding Firmware Packaging recipe" -LICENSE = "TI-TFL" -LIC_FILES_CHKSUM = "file://LICENSE;md5=84ca7278930db001870686ad997d6bb1" - -BRANCH = "master" -SRCREV = "0acbf1d0a7c7eaca0ef14c1a30ce313ea82147e5" - -SRC_URI = "git://git.ti.com/jacinto7_multimedia/ti-img-encode-decode.git;protocol=git;branch=${BRANCH}" - -S = "${WORKDIR}/git" - -PV = "1.0-git${SRCPV}" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -VXD_FW_DIR = "${S}/decoder/firmware/" - -# make sure that lib/firmware, and all its contents are part of the package -FILES_${PN} += "${base_libdir}/firmware" - -do_install() { - install -d ${D}${base_libdir}/firmware - install -m 0755 ${VXD_FW_DIR}/pvdec_full_bin.fw ${D}${base_libdir}/firmware -} - -# This is used to prevent the build system to strip the executables -INHIBIT_PACKAGE_STRIP = "1" -# This is used to prevent the build system to split the debug info in a separate file -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -# As it likely to be a different arch from the Yocto build, disable checking by adding "arch" to INSANE_SKIP -INSANE_SKIP_${PN} += "arch" - -# we don't want to configure and build the source code -do_compile[noexec] = "1" -do_configure[noexec] = "1" diff --git a/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw-source_2020.04a.bb b/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw-source_2020.04a.bb new file mode 100644 index 00000000..becf893e --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw-source_2020.04a.bb @@ -0,0 +1,45 @@ +# ti-sci-fw builds and packages multiple config variants via multiconfig +# Let's take a page from gcc-source as a common recipe for all gcc stages, +# but also to provide a single package for MAINMACHINE of all multiconfigs + +require recipes-bsp/ti-sci-fw/ti-sci-fw_${PV}.inc + +SUMMARY += "- sources" + +COMPATIBLE_MACHINE = "k3" + +EXCLUDE_FROM_WORLD = "1" +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "" + +PACKAGES = "${PN}" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +SRCIPK_SRC_DIR = "${WORKDIR}/imggen" +SRCIPK_INSTALL_DIR = "board-support/k3-image-gen-${PV}" +FILES_${PN} = "${SRCIPK_INSTALL_DIR}" + +do_install() { + # Copy sources for packaging + mkdir -p ${D}/${SRCIPK_INSTALL_DIR} + if [ -e ${SRCIPK_SRC_DIR} ]; then + if [ "${SRCIPK_SRC_DIR}" = "${WORKDIR}" ]; then + excludes='--exclude ./temp --exclude ${D}' + fi + tar -C ${SRCIPK_SRC_DIR} -cO $excludes . | tar -C ${D}/${SRCIPK_INSTALL_DIR} -xpf - + fi + + # Fix up patches/ directory to contain actual patches instead of symlinks + if [ -e ${D}/${SRCIPK_INSTALL_DIR}/patches ] + then + mv ${D}/${SRCIPK_INSTALL_DIR}/patches ${D}/${SRCIPK_INSTALL_DIR}/patches-links + cp -rL ${D}/${SRCIPK_INSTALL_DIR}/patches-links ${D}/${SRCIPK_INSTALL_DIR}/patches + rm -rf ${D}/${SRCIPK_INSTALL_DIR}/patches-links + fi +} + +# Do not perform any QA checks on source package +INSANE_SKIP_${PN} += "${ALL_QA}" diff --git a/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.bb b/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.bb new file mode 100644 index 00000000..b5588265 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.bb @@ -0,0 +1,79 @@ +require recipes-bsp/ti-sci-fw/ti-sci-fw_${PV}.inc + +DEPENDS = "openssl-native u-boot-mkimage-native dtc-native" + +CLEANBROKEN = "1" +PR = "r1" + +# Loaded by R5F core +COMPATIBLE_MACHINE = "k3r5" +COMPATIBLE_MACHINE_aarch64 = "null" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +TI_SECURE_DEV_PKG ?= "" +export TI_SECURE_DEV_PKG + +SYSFW_SOC ?= "unknown" +SYSFW_CONFIG ?= "unknown" + +SYSFW_PREFIX = "ti-sci-firmware" +SYSFW_SUFFIX ?= "unknown" + +SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}" + +SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}*.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_SYMLINK ?= "sysfw.itb" + +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +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 SYSFW_HS_PATH="${S}/ti-sysfw/${SYSFW_BASE}-enc.bin" SYSFW_HS_INNER_CERT_PATH="${S}/ti-sysfw/${SYSFW_BASE}-cert.bin" \ +" +EXTRA_OEMAKE_append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}" + +do_compile() { + cd ${WORKDIR}/imggen/ + oe_runmake +} + +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} + fi +} + +FILES_${PN} = "/boot" + +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}/ +} + +addtask deploy before do_build after do_compile diff --git a/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.inc b/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.inc new file mode 100644 index 00000000..e785ce01 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/ti-sci-fw/ti-sci-fw_2020.04a.inc @@ -0,0 +1,16 @@ +SUMMARY = "TI SCI firmware (SYSFW)" + +LICENSE = "TI-TFL" +LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76" + +SRCREV = "c8decf64be551dfd1244cd1d231a97eb2255fb80" +BRANCH ?= "ti-linux-firmware" +SRCREV_imggen = "d9a550b91ec95d06a80f2ccc6dd829815ba35d88" +SRCREV_FORMAT = "imggen" + +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 \ +" + +S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-bsp/traceframework/traceframework_git.bb b/bsp/meta-ti/recipes-bsp/traceframework/traceframework_git.bb index 2b2020b8..26eb81a0 100644 --- a/bsp/meta-ti/recipes-bsp/traceframework/traceframework_git.bb +++ b/bsp/meta-ti/recipes-bsp/traceframework/traceframework_git.bb @@ -36,3 +36,5 @@ PACKAGES =+ "${PN}-test" FILES_${PN}-test = "${bindir}/tfw*.out \ ${bindir}/*.txt" + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libtraceframework.a" diff --git a/bsp/meta-ti/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/bsp/meta-ti/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend new file mode 100644 index 00000000..2dc715c8 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -0,0 +1,23 @@ +BRANCH_k3 = "ti-atf" +SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa" +SRCREV_tfa_k3 = "5b907a2813faf039d752cdeb6a7b94e95580c46b" +COMPATIBLE_MACHINE_k3 = "k3" +TFA_BUILD_TARGET_k3 = "all" +TFA_INSTALL_TARGET_k3 = "bl31" +TFA_SPD_k3 = "opteed" + +do_compile_append_am65xx-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_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; \ + ) +} diff --git a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2019.01.bb b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2019.01.bb deleted file mode 100644 index 472f5698..00000000 --- a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2019.01.bb +++ /dev/null @@ -1,7 +0,0 @@ -require u-boot-ti.inc - -PR = "r32" - -BRANCH = "ti-u-boot-2019.01" - -SRCREV = "350f3927b89bc06ce1c9ddb618280d298c418b94" diff --git a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb new file mode 100644 index 00000000..6ea97ac9 --- /dev/null +++ b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2020.01.bb @@ -0,0 +1,7 @@ +require u-boot-ti.inc + +PR = "r12" + +BRANCH = "ti-u-boot-2020.01" + +SRCREV = "f9b0d030d31ab79577f1dd1e48814a8f3119c481" diff --git a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc index f1187e64..062a692a 100644 --- a/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc +++ b/bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti.inc @@ -13,6 +13,7 @@ UBOOT_LOCALVERSION = "-g${@get_git_revision('${S}').__str__()[:10]}" UBOOT_SUFFIX ?= "img" SPL_BINARY ?= "MLO" +require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot-common.inc require ${COREBASE}/meta/recipes-bsp/u-boot/u-boot.inc FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:" @@ -32,11 +33,12 @@ PV_append = "+git${SRCPV}" # u-boot needs devtree compiler to parse dts files DEPENDS += "dtc-native bc-native lzop-native flex-native bison-native" -PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/boot/bl31.bin,,arm-trusted-firmware" +PACKAGECONFIG[atf] = "ATF=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}/boot/bl32.bin,,optee-os" -# optee-os is not a direct dependency, do not enable optee by default -PACKAGECONFIG_append_k3 = " atf" +PACKAGECONFIG_append_aarch64 = " atf optee" + +COMPATIBLE_MACHINE = "(ti-soc)" EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" @@ -55,6 +57,7 @@ export TI_SECURE_DEV_PKG SPL_UART_BINARY = "u-boot-spl.bin" SPL_UART_BINARY_keystone = "" SPL_UART_BINARY_k3 = "" +SPL_UART_BINARY_k3r5 = "" SPL_UART_BINARY_lego-ev3 = "" SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" @@ -256,6 +259,13 @@ do_deploy_append () { ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY} fi fi + + rm ${DEPLOYDIR}/u-boot-initial-env || true + rm ${DEPLOYDIR}/${PN}-initial-env || true + rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true + rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true + rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true + rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true } do_install_append_keystone () { diff --git a/bsp/meta-ti/recipes-bsp/vis-fw/vis_01.50.07.15.bb b/bsp/meta-ti/recipes-bsp/vis-fw/vis_01.50.07.15.bb index 5b9834c2..6eaf8de7 100644 --- a/bsp/meta-ti/recipes-bsp/vis-fw/vis_01.50.07.15.bb +++ b/bsp/meta-ti/recipes-bsp/vis-fw/vis_01.50.07.15.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Radio Application Firmware" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3" -COMPATIBLE_MACHINE = "dra7xx-evm" +COMPATIBLE_MACHINE = "dra7xx" PACKAGE_ARCH = "${MACHINE_ARCH}" PR = "r1" -SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vis/01_50_07_15/exports/vis-${MACHINE}-01.50.07.15.tar.gz;protocol=http" +SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vis/01_50_07_15/exports/vis-dra7xx-evm-01.50.07.15.tar.gz;protocol=http" SRC_URI[md5sum] = "fe8b00e398fb3b7ada0c15b601867acb" SRC_URI[sha256sum] = "6e2aa47ae892910616ebdc96646af778af9a59ca0657716ab4fa4b24a9afae69" diff --git a/bsp/meta-ti/recipes-bsp/x-load/signgp.bb b/bsp/meta-ti/recipes-bsp/x-load/signgp.bb index 9c3499f6..479e6f81 100644 --- a/bsp/meta-ti/recipes-bsp/x-load/signgp.bb +++ b/bsp/meta-ti/recipes-bsp/x-load/signgp.bb @@ -1,4 +1,4 @@ -LICENSE = "NewBSD" +LICENSE = "BSD-3-Clause" DESCRIPTION = "Tool to sign omap3 x-loader images" LIC_FILES_CHKSUM = "file://signGP.c;md5=960f484fea13941ca88821366f9dade0" diff --git a/bsp/meta-ti/recipes-devtools/gdbc6x/gdbc6x/0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch b/bsp/meta-ti/recipes-devtools/gdbc6x/gdbc6x/0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch new file mode 100644 index 00000000..1cc23b32 --- /dev/null +++ b/bsp/meta-ti/recipes-devtools/gdbc6x/gdbc6x/0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch @@ -0,0 +1,28 @@ +From 0aa294e2bbd37a42266e59cb67687e57bfba4a88 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Sat, 15 Feb 2020 15:59:37 -0500 +Subject: [PATCH] libbfd.h: suppress GCC9 -Wstringop-truncation + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + gdbc6x/bfd/libbfd.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gdbc6x/bfd/libbfd.h b/gdbc6x/bfd/libbfd.h +index 72d3c50..3465f89 100644 +--- a/gdbc6x/bfd/libbfd.h ++++ b/gdbc6x/bfd/libbfd.h +@@ -34,6 +34,10 @@ + #pragma GCC diagnostic ignored "-Wcast-function-type" + #endif + ++#if __GNUC__ >= 9 ++#pragma GCC diagnostic ignored "-Wstringop-truncation" ++#endif ++ + #include "hashtab.h" + + /* Align an address upward to a boundary, expressed as a number of bytes. +-- +2.7.4 + diff --git a/bsp/meta-ti/recipes-devtools/gdbc6x/gdbc6x_git.bb b/bsp/meta-ti/recipes-devtools/gdbc6x/gdbc6x_git.bb index 8ab9cf90..2d2f6c1d 100644 --- a/bsp/meta-ti/recipes-devtools/gdbc6x/gdbc6x_git.bb +++ b/bsp/meta-ti/recipes-devtools/gdbc6x/gdbc6x_git.bb @@ -11,6 +11,7 @@ PR = "${INC_PR}.1" SRC_URI_append = " \ file://init \ + file://0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch;striplevel=2 \ " S = "${WORKDIR}/git/gdbc6x" diff --git a/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-CMakeLists.txt-disable-phys-addr-for-now.patch b/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-CMakeLists.txt-disable-phys-addr-for-now.patch deleted file mode 100644 index 7cf5895c..00000000 --- a/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-CMakeLists.txt-disable-phys-addr-for-now.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 85264fc72a261d20107a50ea2fad0258900a132b Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Sat, 20 Apr 2019 16:54:03 +0000 -Subject: [PATCH] CMakeLists.txt: disable phys-addr for now - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> ---- - CMakeLists.txt | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1d60003..eca6ba7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,16 +54,3 @@ target_link_libraries(ion-print-heaps - target_include_directories(ion-print-heaps PUBLIC ${LIBION_INCLUDE_DIRS}) - - install(TARGETS ion-print-heaps RUNTIME DESTINATION bin) -- --# phys-addr -- --add_executable(phys-addr -- src/phys-addr.c --) -- --target_link_libraries(phys-addr -- ${LIBION_LIBRARIES} --) --target_include_directories(phys-addr PUBLIC ${LIBION_INCLUDE_DIRS}) -- --install(TARGETS phys-addr RUNTIME DESTINATION bin) --- -2.17.1 - diff --git a/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch b/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch deleted file mode 100644 index 8915c642..00000000 --- a/bsp/meta-ti/recipes-devtools/ion/ion-tests/0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch +++ /dev/null @@ -1,69 +0,0 @@ -From f045cbf9aae0053e9e785e32b772e473aa892443 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 6 Oct 2019 16:08:36 -0700 -Subject: [PATCH] map_test: Replace PAGE_SIZE with local variable name - -PAGE_SIZE is already a define in libc implementations global namespace -e.g. in musl. Therefore its best to use a unique variable name to not -stamp on the global definition. - -Fixes -src/map_test.cpp:59:23: error: expected unqualified-id -unsigned long PAGE_SIZE = sysconf(_SC_PAGESIZE); -^ -/usr/include/limits.h:89:19: note: expanded from macro 'PAGE_SIZE' -^ -/usr/include/bits/limits.h:3:18: note: expanded from macro 'PAGESIZE' -^ - -Upstream-Status: Submitted [https://github.com/glneo/ion-tests/pull/1] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/map_test.cpp | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/map_test.cpp b/src/map_test.cpp -index a7ce2c9..7b5746d 100644 ---- a/src/map_test.cpp -+++ b/src/map_test.cpp -@@ -56,27 +56,27 @@ TEST_F(Map, MapOffset) - SCOPED_TRACE(::testing::Message() << "heap " << heapMask); - int map_fd = -1; - -- unsigned long PAGE_SIZE = sysconf(_SC_PAGESIZE); -+ unsigned long psize = sysconf(_SC_PAGESIZE); - -- ASSERT_EQ(0, ion_alloc(m_ionFd, PAGE_SIZE * 2, heapMask, 0, &map_fd)); -+ ASSERT_EQ(0, ion_alloc(m_ionFd, psize * 2, heapMask, 0, &map_fd)); - ASSERT_GE(map_fd, 0); - - unsigned char *ptr; -- ptr = (unsigned char *)mmap(NULL, PAGE_SIZE * 2, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0); -+ ptr = (unsigned char *)mmap(NULL, psize * 2, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, 0); - ASSERT_TRUE(ptr != NULL); - -- memset(ptr, 0, PAGE_SIZE); -- memset(ptr + PAGE_SIZE, 0xaa, PAGE_SIZE); -+ memset(ptr, 0, psize); -+ memset(ptr + psize, 0xaa, psize); - -- ASSERT_EQ(0, munmap(ptr, PAGE_SIZE * 2)); -+ ASSERT_EQ(0, munmap(ptr, psize * 2)); - -- ptr = (unsigned char *)mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, PAGE_SIZE); -+ ptr = (unsigned char *)mmap(NULL, psize, PROT_READ | PROT_WRITE, MAP_SHARED, map_fd, psize); - ASSERT_TRUE(ptr != NULL); - - ASSERT_EQ(ptr[0], 0xaa); -- ASSERT_EQ(ptr[PAGE_SIZE - 1], 0xaa); -+ ASSERT_EQ(ptr[psize - 1], 0xaa); - -- ASSERT_EQ(0, munmap(ptr, PAGE_SIZE)); -+ ASSERT_EQ(0, munmap(ptr, psize)); - - ASSERT_EQ(0, close(map_fd)); - } --- -2.23.0 - diff --git a/bsp/meta-ti/recipes-devtools/ion/ion-tests_git.bb b/bsp/meta-ti/recipes-devtools/ion/ion-tests_git.bb deleted file mode 100644 index 52346f1c..00000000 --- a/bsp/meta-ti/recipes-devtools/ion/ion-tests_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Test cases for ION" -HOMEPAGE = "https://github.com/glneo/ion-tests" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://src/ion_test.c;beginline=1;endline=15;md5=b225db900869a4cd31461606e55a3ec5" - -PV = "1.0" - -BRANCH = "master" -SRC_URI = "git://github.com/glneo/ion-tests.git;protocol=git;branch=${BRANCH} \ - file://0001-CMakeLists.txt-disable-phys-addr-for-now.patch \ - file://0001-map_test-Replace-PAGE_SIZE-with-local-variable-name.patch \ -" -SRCREV = "70d730cebca29e6fd37b21d9beac82ae645f3900" - -DEPENDS = "libion gtest" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig diff --git a/bsp/meta-ti/recipes-devtools/k3conf/k3conf_git.bb b/bsp/meta-ti/recipes-devtools/k3conf/k3conf_git.bb new file mode 100644 index 00000000..52c2fcf6 --- /dev/null +++ b/bsp/meta-ti/recipes-devtools/k3conf/k3conf_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "Diagnostic tool for TI K3 processors" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://common/k3conf.c;beginline=1;endline=34;md5=37f4e460bd8501c6f02ce71f02bc7ccf" + +PV = "0.1+git${SRCPV}" + +COMPATIBLE_MACHINE = "k3" + +BRANCH ?= "master" +SRCREV = "9199c3a3b6ec5603a2c4283410b4761e79e81e82" + +SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}" + +S = "${WORKDIR}/git" + +do_compile () { + oe_runmake CC="${CC}" CROSS_COMPILE=${TARGET_PREFIX} all +} + +do_install () { + install -d ${D}${bindir} + install ${S}/k3conf ${D}${bindir} +} diff --git a/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb index e8c2f011..55758682 100644 --- a/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb +++ b/bsp/meta-ti/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb @@ -3,7 +3,11 @@ HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://Manifest.html;md5=a9121e8936ace09820d23f7626daaca5" -COMPATIBLE_MACHINE = "dra7xx" +inherit features_check + +REQUIRED_MACHINE_FEATURES = "gc320" + +COMPATIBLE_MACHINE = "omap-a15" CLEANBROKEN = "1" @@ -12,6 +16,8 @@ BRANCH = "ti-${PV}" SRC_URI = "git://git.ti.com/graphics/ti-gc320-libs.git;protocol=git;branch=${BRANCH}" SRCREV = "c0afab259de59909cfe74c01f3f7fbaa147f94b5" +RRECOMMENDS_${PN} = "ti-gc320-driver" + # There's only hardfp version available python __anonymous() { tunes = d.getVar("TUNE_FEATURES") diff --git a/bsp/meta-ti/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb b/bsp/meta-ti/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb index 9cb863a5..edb4b753 100644 --- a/bsp/meta-ti/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb +++ b/bsp/meta-ti/recipes-graphics/libgles/ti-img-rogue-umlibs_1.10.5371573.bb @@ -3,15 +3,19 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" LICENSE = "TI-TFL" LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" +inherit features_check + +REQUIRED_MACHINE_FEATURES = "gpu" + PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7-evm" +COMPATIBLE_MACHINE = "j7" -PR = "r5" +PR = "r8" -BRANCH = "linuxws/thud/k4.19/${PV}" +BRANCH = "linuxws/zeus/k5.4/${PV}" SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" -SRCREV = "0721cdfc1fc86f40c93745159e3f1bcad5beda17" +SRCREV = "6b4d8e538566bbaf6b9c4a24dbecd740d58c1871" PVR_SOC ?= "j721e_linux" PVR_BUILD ?= "release" @@ -26,8 +30,7 @@ PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" DEPENDS += "libdrm wayland expat" RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "python-core" -RDEPENDS_${PN} += "ti-img-rogue-driver wayland expat" +RDEPENDS_${PN} += "wayland expat" RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm" RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" @@ -41,6 +44,8 @@ RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm" RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg" +RRECOMMENDS_${PN} += "ti-img-rogue-driver" + S = "${WORKDIR}/git" do_install () { diff --git a/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index ecf3ffcc..6639ec5c 100644 --- a/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/bsp/meta-ti/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -3,20 +3,26 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8" +inherit features_check + +REQUIRED_MACHINE_FEATURES = "gpu" + PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "pandaboard|beagleboard|ti33x|ti43x|omap-a15|k3" -PR = "r34" +PR = "r35" -BRANCH = "ti-img-sgx/thud/${PV}" +BRANCH = "ti-img-sgx/zeus/${PV}" SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}" -SRCREV = "2a2e5bb090ced870d73ed4edbc54793e952cc6d8" +SRCREV = "ce7b96b88d31da27af5b3a2a890aba180a014fc4" TARGET_PRODUCT_omap-a15 = "jacinto6evm" TARGET_PRODUCT_ti33x = "ti335x" TARGET_PRODUCT_ti43x = "ti437x" TARGET_PRODUCT_k3 = "ti654x" +TARGET_PRODUCT_beagleboard = "ti343x" +TARGET_PRODUCT_pandaboard = "ti443x" INITSCRIPT_NAME = "rc.pvr" INITSCRIPT_PARAMS = "defaults 8" @@ -43,6 +49,8 @@ RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" # The actual SONAME is libGLESv2.so.2, so need to explicitly specify RPROVIDES for .so.1 here RPROVIDES_${PN} += "libGLESv2.so.1" +RRECOMMENDS_${PN} += "ti-sgx-ddk-km" + S = "${WORKDIR}/git" do_install () { @@ -59,14 +67,7 @@ FILES_${PN} += " ${libdir}/*" FILES_${PN} += "${includedir}/*" FILES_${PN} += "${sysconfdir}/*" -PACKAGES =+ "${PN}-plugins" -FILES_${PN}-plugins = "${libdir}/libsrv_init.so ${libdir}/libsrv_um.so ${libdir}/libglslcompiler.so ${libdir}/libPVRScopeServices.so ${libdir}/libGLESv2.so ${libdir}/libEGL.so ${libdir}/libGLESv1_CM.so ${libdir}/libGLES_CM.so ${libdir}/libGLESv1_PVR_MESA.so ${libdir}/libGLESv2_PVR_MESA.so" -RDEPENDS_${PN} += "${PN}-plugins" - -ALLOW_EMPTY_${PN}-plugins = "1" - INSANE_SKIP_${PN} += "dev-so ldflags useless-rpaths" -INSANE_SKIP_${PN}-plugins = "dev-so" -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP_${PN} += "already-stripped dev-deps" CLEANBROKEN = "1" diff --git a/bsp/meta-ti/recipes-graphics/omapfbplay/files/0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch b/bsp/meta-ti/recipes-graphics/omapfbplay/files/0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch deleted file mode 100644 index e01fddbf..00000000 --- a/bsp/meta-ti/recipes-graphics/omapfbplay/files/0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71670f4a067efc169018a9ec9321ccc9af3bbd59 Mon Sep 17 00:00:00 2001 -From: Roger Monk <r-monk@ti.com> -Date: Thu, 10 May 2012 14:50:11 +0100 -Subject: [PATCH] omapfbplay: switch CODEC_TYPE_VIDEO to AVMEDIA_TYPE_VIDEO - -Signed-off-by: Roger Monk <r-monk@ti.com> ---- - omapfbplay.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/omapfbplay.c b/omapfbplay.c -index ad35bd5..818cf2c 100644 ---- a/omapfbplay.c -+++ b/omapfbplay.c -@@ -74,7 +74,7 @@ find_stream(AVFormatContext *afc) - int i; - - for (i = 0; i < afc->nb_streams; i++) { -- if (afc->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO && !st) -+ if (afc->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO && !st) - st = afc->streams[i]; - else - afc->streams[i]->discard = AVDISCARD_ALL; --- -1.7.0.4 - diff --git a/bsp/meta-ti/recipes-graphics/omapfbplay/files/omapfbplay-errorhandling.patch b/bsp/meta-ti/recipes-graphics/omapfbplay/files/omapfbplay-errorhandling.patch deleted file mode 100644 index 7dd544f8..00000000 --- a/bsp/meta-ti/recipes-graphics/omapfbplay/files/omapfbplay-errorhandling.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e321ae7df57ada9ecc8c155fa4e5511c96ef5db3 Mon Sep 17 00:00:00 2001 -From: Rob Clark <rob@ti.com> -Date: Fri, 18 Mar 2011 12:40:51 -0500 -Subject: [PATCH] dce: differentiate between fatal and non-fatal errors - -For streams with errors, the codec will throw back an error. But not -all errors are fatal. ---- - dce.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/dce.c b/dce.c -index ab7ad0a..88f175e 100644 ---- a/dce.c -+++ b/dce.c -@@ -270,8 +270,14 @@ static int dce_decode(AVPacket *p) - - err = VIDDEC3_process(codec, inbufs, outbufs, in_args, out_args); - if (err) { -- fprintf(stderr, "VIDDEC3_process() error %d\n", err); -- return -1; -+ fprintf(stderr, "VIDDEC3_process() error %d %08x\n", err, -+ out_args->extendedError); -+ /* for non-fatal errors, keep going.. a non-fatal error could -+ * just indicate an error in the input stream which the codec -+ * was able to conceal -+ */ -+ if (XDM_ISFATALERROR(out_args->extendedError)) -+ return -1; - } - - for (i = 0; i < out_args->outputID[i]; i++) { --- -1.7.1 diff --git a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-cmem_git.bb b/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-cmem_git.bb deleted file mode 100644 index a0392f6c..00000000 --- a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-cmem_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -require omapfbplay.inc - -DEPENDS += "ti-linuxutils" - -require recipes-ti/includes/ti-paths.inc - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SDMA_CFLAGS = " -I${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/sdma/include/" -CMEM_CFLAGS = " -I${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/cmem/include/" -CFLAGS += " -I. -I${STAGING_KERNEL_DIR}/include ${SDMA_CFLAGS} ${CMEM_CFLAGS}" - -export SDMA_LIBS = "-L${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/sdma/lib -l:sdma.a470MV" -export CMEM_LIBS = "-L${LINUXUTILS_INSTALL_DIR}/packages/ti/sdo/linuxutils/cmem/lib -l:cmem.a470MV" - -OMAPFBPLAYOPTS = "V4L2=y OMAPFB=y NETSYNC=y CMEM=y SDMA=y" diff --git a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-dce_git.bb b/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-dce_git.bb deleted file mode 100644 index e70ac729..00000000 --- a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-dce_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require omapfbplay.inc - -DEPENDS += "libdce" - -CFLAGS += " -I. -I${STAGING_INCDIR}/dce -I${STAGING_KERNEL_DIR}/include " - -OMAPFBPLAYOPTS = "V4L2=y OMAPFB=y NETSYNC=y DCE=y" diff --git a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-xv_git.bb b/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-xv_git.bb deleted file mode 100644 index cadf6d8e..00000000 --- a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay-xv_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require omapfbplay.inc - -OMAPFBPLAYOPTS = "V4L2=y NETSYNC=y XV=y" diff --git a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay.inc b/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay.inc deleted file mode 100644 index 744eb8f7..00000000 --- a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay.inc +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Simple libav-based player that uses the omapfb overlays" -DEPENDS = "bzip2 lame libav virtual/kernel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://omapfbplay.c;beginline=2;endline=22;md5=05d3789ab362e6f4a9682e98100ea0fa" - -PV = "0.0+${PR}+gitr${SRCREV}" - -SRCREV = "34293052c5a2ae328eac6903512e6b4ce19b5639" -SRC_URI = "git://git.mansr.com/omapfbplay;protocol=git \ - file://omapfbplay-errorhandling.patch \ - file://0001-omapfbplay-switch-CODEC_TYPE_VIDEO-to-AVMEDIA_TYPE_V.patch \ - " - -S = "${WORKDIR}/git" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)" - -# We want a kernel header for armv7a, but we don't want to make mplayer machine specific for that -STAGING_KERNEL_DIR = "${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" -CFLAGS += " -I. -I${STAGING_KERNEL_DIR}/include " - -OMAPFBPLAYVARIANT ?= "${PN}" -OMAPFBPLAYOPTS ?= "V4L2=y NETSYNC=y" - -do_compile() { - cp ${STAGING_KERNEL_DIR}/arch/arm/plat-omap/include/mach/omapfb.h ${S} || true - cp ${STAGING_KERNEL_DIR}/include/asm-arm/arch-omap/omapfb.h ${S} || true - cp ${STAGING_KERNEL_DIR}/include/linux/omapfb.h ${S} || true - oe_runmake ${TARGET_ARCH}=y ${OMAPFBPLAYOPTS} -e -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/omapfbplay ${D}/${bindir}/${OMAPFBPLAYVARIANT} -} diff --git a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay_git.bb b/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay_git.bb deleted file mode 100644 index 0d3956f1..00000000 --- a/bsp/meta-ti/recipes-graphics/omapfbplay/omapfbplay_git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require omapfbplay.inc - -OMAPFBPLAYOPTS = "V4L2=y OMAPFB=y NETSYNC=y" diff --git a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omap3/xorg.conf b/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omap3/xorg.conf deleted file mode 100644 index 983bb082..00000000 --- a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omap3/xorg.conf +++ /dev/null @@ -1,29 +0,0 @@ -Section "Module" - Load "extmod" - Load "dbe" - Load "glx" - Load "freetype" - Load "type1" - Load "record" - Load "dri" -EndSection - -Section "Monitor" - Identifier "Builtin Default Monitor" -EndSection - -Section "Device" - Identifier "Builtin Default fbdev Device 0" - Driver "omapfb" -EndSection - -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection - -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection diff --git a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf b/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf deleted file mode 100644 index 87ded4dd..00000000 --- a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf +++ /dev/null @@ -1,15 +0,0 @@ -# more /usr/share/X11/xorg.conf.d/99-omap.conf -# X.Org X server configuration file - -Section "Device" - Identifier "Video Device" - Driver "omap" - Option "Debug" "false" - Option "HWcursor" "false" -EndSection - -Section "Screen" - Identifier "Screen" - Monitor "Monitor" - Device "Video Device" -EndSection diff --git a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omapl138/xorg.conf b/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omapl138/xorg.conf deleted file mode 100644 index 0d6ab435..00000000 --- a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/omapl138/xorg.conf +++ /dev/null @@ -1,29 +0,0 @@ -Section "Module" - Load "extmod" - Load "dbe" - Load "glx" - Load "freetype" - Load "type1" - Load "record" - Load "dri" -EndSection - -Section "Monitor" - Identifier "Builtin Default Monitor" -EndSection - -Section "Device" - Identifier "Builtin Default fbdev Device 0" - Driver "fbdev" -EndSection - -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection - -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection diff --git a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/ti33x/xorg.conf b/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/ti33x/xorg.conf deleted file mode 100644 index 0d6ab435..00000000 --- a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config/ti33x/xorg.conf +++ /dev/null @@ -1,29 +0,0 @@ -Section "Module" - Load "extmod" - Load "dbe" - Load "glx" - Load "freetype" - Load "type1" - Load "record" - Load "dri" -EndSection - -Section "Monitor" - Identifier "Builtin Default Monitor" -EndSection - -Section "Device" - Identifier "Builtin Default fbdev Device 0" - Driver "fbdev" -EndSection - -Section "Screen" - Identifier "Builtin Default fbdev Screen 0" - Device "Builtin Default fbdev Device 0" - Monitor "Builtin Default Monitor" -EndSection - -Section "ServerLayout" - Identifier "Builtin Default Layout" - Screen "Builtin Default fbdev Screen 0" -EndSection diff --git a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend deleted file mode 100644 index 72d991c7..00000000 --- a/bsp/meta-ti/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch new file mode 100644 index 00000000..f4922363 --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse/0001-tools-update-shebang-in-helper-scripts-for-python3.patch @@ -0,0 +1,56 @@ +From 24e58c75592a2ba09f3062c8a4722c0e29a9b558 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <denys@ti.com> +Date: Wed, 1 Apr 2020 15:44:46 -0400 +Subject: [PATCH] tools: update shebang in helper scripts for python3 + +Signed-off-by: Denys Dmytriyenko <denys@ti.com> +--- + tools/jailhouse-cell-linux | 2 +- + tools/jailhouse-cell-stats | 2 +- + tools/jailhouse-config-create | 2 +- + tools/jailhouse-hardware-check | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tools/jailhouse-cell-linux b/tools/jailhouse-cell-linux +index 007a5c4..e106b9d 100755 +--- a/tools/jailhouse-cell-linux ++++ b/tools/jailhouse-cell-linux +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Jailhouse, a Linux-based partitioning hypervisor + # +diff --git a/tools/jailhouse-cell-stats b/tools/jailhouse-cell-stats +index 2f7e966..4c5289f 100755 +--- a/tools/jailhouse-cell-stats ++++ b/tools/jailhouse-cell-stats +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Jailhouse, a Linux-based partitioning hypervisor + # +diff --git a/tools/jailhouse-config-create b/tools/jailhouse-config-create +index 1e2df74..9382b05 100755 +--- a/tools/jailhouse-config-create ++++ b/tools/jailhouse-config-create +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Jailhouse, a Linux-based partitioning hypervisor + # +diff --git a/tools/jailhouse-hardware-check b/tools/jailhouse-hardware-check +index 375816e..658ce6f 100755 +--- a/tools/jailhouse-hardware-check ++++ b/tools/jailhouse-hardware-check +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # Jailhouse, a Linux-based partitioning hypervisor + # +-- +2.7.4 + diff --git a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb index 4186dc3a..46447af6 100644 --- a/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb +++ b/bsp/meta-ti/recipes-kernel/jailhouse/jailhouse_git.bb @@ -10,26 +10,27 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ " -PV = "0.10+git${SRCPV}" -SRCREV = "b3a68ac89d7ed955546eae91954b184ec1583ce3" -BRANCH = "ti-jailhouse-0.10" +PV = "0.12+git${SRCPV}" +SRCREV = "8fd88c37ae1a4f7130ef40899c0eadd737c64832" +BRANCH = "ti-jailhouse-0.12" SRC_URI = " \ git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \ + file://0001-tools-update-shebang-in-helper-scripts-for-python3.patch \ " -DEPENDS = "virtual/kernel dtc-native python-mako-native python-mako make-native" +DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native" RDEPENDS_${PN} += "\ - python-curses\ - python-datetime\ - python-argparse\ - python-mmap\ + python3-curses\ + python3-datetime\ + python3-mmap\ " -S = "${WORKDIR}/git" - require jailhouse-arch.inc -inherit module pythonnative bash-completion deploy setuptools +inherit module python3native bash-completion deploy setuptools3 + +S = "${WORKDIR}/git" +B = "${S}" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(ti-soc)" @@ -40,37 +41,33 @@ CELL_DIR ?= "${JH_DATADIR}/cells" CELLCONF_DIR ?= "${JH_DATADIR}/configs" INMATES_DIR ?= "${JH_DATADIR}/inmates" -JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" -JH_CONFIG_k3 ?= "${S}/ci/jailhouse-config-k3.h" - JH_CELL_FILES ?= "*.cell" JH_CELL_FILES_k3 ?= "k3-*.cell" JH_INMATE_DTB ?= "" JH_INMATE_DTB_am65xx ?= "inmate-k3-am654-idk.dtb" -JH_INMATE_DTB_j7-evm ?= "inmate-k3-j721e-evm.dtb" +JH_INMATE_DTB_j7 ?= "inmate-k3-j721e-evm.dtb" JH_LINUX_DEMO_CELL ?= "" JH_LINUX_DEMO_CELL_am65xx ?= "k3-am654-idk-linux-demo.cell" -JH_LINUX_DEMO_CELL_j7-evm ?= "k3-j721e-evm-linux-demo.cell" +JH_LINUX_DEMO_CELL_j7 ?= "k3-j721e-evm-linux-demo.cell" JH_SYSCONFIG_CELL ?= "" JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell" -JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell" +JH_SYSCONFIG_CELL_j7 ?= "k3-j721e-evm.cell" INITRAMFS_IMAGE ?= "" JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}" JH_CMDLINE ?= "" -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8" +JH_CMDLINE_am65xx ?= "console=ttyS1,115200n8" +JH_CMDLINE_j7 ?= "console=ttyS3,115200n8" do_configure() { if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; then cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/ fi - - cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h } USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ @@ -88,12 +85,12 @@ do_compile() { do_install() { # Install pyjailhouse python modules needed by the tools - distutils_do_install + distutils3_do_install # We want to install the python tools, but we do not want to use pip... # At least with v0.10, we can work around this with # 'PIP=":" PYTHON_PIP_USEABLE=yes' - oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install + oe_runmake PIP=: PYTHON=python3 PYTHON_PIP_USEABLE=yes DESTDIR=${D} install install -d ${D}${CELL_DIR} install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/ @@ -141,8 +138,8 @@ FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /b FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*" -RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression" -RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell" +RDEPENDS_${PN}-tools = "pyjailhouse python3-mmap python3-math python3-datetime python3-curses python3-compression" +RDEPENDS_pyjailhouse = "python3-core python3-ctypes python3-fcntl python3-shell" RRECOMMENDS_${PN} = "${PN}-tools" diff --git a/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb b/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb index 96263875..f478e56d 100644 --- a/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb +++ b/bsp/meta-ti/recipes-kernel/kselftests/kselftests_4.10.bb @@ -185,3 +185,6 @@ INSANE_SKIP_${PN}-exec = "ldflags" INSANE_SKIP_${PN}-ipc = "ldflags" INSANE_SKIP_${PN}-mount = "ldflags" INSANE_SKIP_${PN}-vm = "ldflags" + +COMPATIBLE_MACHINE_riscv64 = "(null)" +COMPATIBLE_MACHINE_riscv32 = "(null)" diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/defconfig index d083d182..d083d182 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/dra7xx/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig index dcb53bab..dcb53bab 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/dra7xx/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/dra7xx/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k2g/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig index 316b04bb..316b04bb 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k2g/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k2g/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k3/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig index b9bc6137..b9bc6137 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/k3/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/k3/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/keystone/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig index 5a40b93d..5a40b93d 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/keystone/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/keystone/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/omapl138/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig index b3467853..b3467853 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/omapl138/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/omapl138/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti33x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig index 88f80fa9..88f80fa9 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti33x/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti33x/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti43x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig index 4b9daaf9..4b9daaf9 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-4.19/ti43x/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-5.4/ti43x/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/defconfig index f0b8bab0..f0b8bab0 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/dra7xx/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/dra7xx/defconfig index 47e3d04a..47e3d04a 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/dra7xx/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/dra7xx/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k2g/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig index a9c24f2e..a9c24f2e 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k2g/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k2g/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k3/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k3/defconfig index cc10bfda..cc10bfda 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/k3/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/k3/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/keystone/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig index fc68085f..fc68085f 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/keystone/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/keystone/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti33x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti33x/defconfig index 0a4fbac2..0a4fbac2 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti33x/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti33x/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti43x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti43x/defconfig index 99594c81..99594c81 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-4.19/ti43x/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt-5.4/ti43x/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb deleted file mode 100644 index 5c56b286..00000000 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_4.19.bb +++ /dev/null @@ -1,10 +0,0 @@ -require linux-ti-staging_4.19.bb - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" - -BRANCH = "ti-rt-linux-4.19.y" - -SRCREV = "69c51d6d57c150155bea8dd032bd8ce7835cf234" -PV = "4.19.94+git${SRCPV}" diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb new file mode 100644 index 00000000..6c53ec95 --- /dev/null +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-rt_5.4.bb @@ -0,0 +1,10 @@ +require linux-ti-staging_5.4.bb + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:" + +BRANCH = "ti-rt-linux-5.4.y" + +SRCREV = "17e2c5c658e9bcdf7566c9e7f70b1f0a8c9f7036" +PV = "5.4.43+git${SRCPV}" diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/defconfig index 5d051bd1..5d051bd1 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/dra7xx/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/dra7xx/defconfig index 2b3635c3..2b3635c3 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/dra7xx/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/dra7xx/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k2g/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig index abfb3309..abfb3309 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k2g/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k2g/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k3/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k3/defconfig index 56cf9302..56cf9302 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/k3/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/k3/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/keystone/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig index e95bcf95..e95bcf95 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/keystone/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/keystone/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/omapl138/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/omapl138/defconfig index 95b61168..95b61168 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/omapl138/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/omapl138/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti33x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti33x/defconfig index 9ab6733c..9ab6733c 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti33x/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti33x/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti43x/defconfig b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti43x/defconfig index 825c31cd..825c31cd 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-4.19/ti43x/defconfig +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest-5.4/ti43x/defconfig diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_5.4.bb index 6f02f1a7..a2404574 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_4.19.bb +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging-systest_5.4.bb @@ -1,5 +1,5 @@ -require linux-ti-staging_4.19.bb +require linux-ti-staging_5.4.bb # Look in the generic major.minor directory for files # This will have priority over generic non-rt path -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:" diff --git a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_5.4.bb index ab9653e1..bfcc7f5b 100644 --- a/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.19.bb +++ b/bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_5.4.bb @@ -11,7 +11,7 @@ require recipes-kernel/linux/ti-uio.inc require recipes-kernel/linux/bundle-devicetree.inc # Look in the generic major.minor directory for files -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.19:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.4:" # Pull in the devicetree files into the rootfs RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" @@ -44,24 +44,25 @@ RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2e = " netcp-pa-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2l = " netcp-pa-fw" # Add run-time dependency for PRU Ethernet firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw" -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-evm = " prueth-fw prusw-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am57xx-hs-evm = " prueth-fw prusw-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti43x = " prueth-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_ti33x = " prueth-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_k2g = " prueth-fw" RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx = " prueth-fw-am65x" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_am65xx-evm = " prueth-fw-am65x-sr2" # Add run-time dependency for Cadence MHDP firmware to the rootfs -RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7-evm = " cadence-mhdp-fw" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base_append_j7 = " cadence-mhdp-fw" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/git" -BRANCH = "ti-linux-4.19.y" +BRANCH = "ti-linux-5.4.y" -SRCREV = "5a23bc00e08d26bb83952953d909c95b42fab70c" -PV = "4.19.94+git${SRCPV}" +SRCREV = "66cf445b7697a4963cfc796e06918fe5b147fe7d" +PV = "5.4.40+git${SRCPV}" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild MACHINE_KERNEL_PR_append = "a" @@ -79,3 +80,4 @@ module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" 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" diff --git a/bsp/meta-ti/recipes-multimedia/libdce/libdce_3.00.14.00.bb b/bsp/meta-ti/recipes-multimedia/libdce/libdce_3.00.14.00.bb index 4d032422..a82644a2 100644 --- a/bsp/meta-ti/recipes-multimedia/libdce/libdce_3.00.14.00.bb +++ b/bsp/meta-ti/recipes-multimedia/libdce/libdce_3.00.14.00.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Library used for remotely invoking the hw accelerated codec on IVA-HD" +SUMMARY = "Library for remotely invoking HW accelerated codecs on IVA-HD" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://libdce.h;beginline=1;endline=31;md5=0a398cf815b8b5f31f552266cd453dae" diff --git a/bsp/meta-ti/recipes-security/optee/optee-%.bbappend b/bsp/meta-ti/recipes-security/optee/optee-%.bbappend new file mode 100644 index 00000000..32307e2f --- /dev/null +++ b/bsp/meta-ti/recipes-security/optee/optee-%.bbappend @@ -0,0 +1 @@ +COMPATIBLE_MACHINE_ti-soc = "ti-soc" diff --git a/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-capes.bb b/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-capes.bb index e74033a1..569a3e5a 100644 --- a/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-capes.bb +++ b/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-capes.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Userspace setup for beaglebone capes" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" PR = "r4" diff --git a/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-getting-started.bb b/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-getting-started.bb index 6c61a4e9..adde30b4 100644 --- a/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-getting-started.bb +++ b/bsp/meta-ti/recipes-ti/beagleboard/beaglebone-getting-started.bb @@ -1,13 +1,13 @@ -DESCRIPTION = "BeagleBone Getting Started Guide" +SUMMARY = "BeagleBone Getting Started Guide" -PR = "r21" +PR = "r22" inherit allarch -LICENSE = "GPLv2+ & MIT & PD & others" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=603591dea023c3c75b48e07cb47ce639" +LICENSE = "CC-BY-SA-3.0 & GPLv3+ & MIT & PD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6f02761e31334c48f7021fb94c89aaa" -SRCREV = "6c548a307c948b28a99d48fd17d9790b56182196" +SRCREV = "05bedba192646152b7bc80b0accaea75aef864e5" SRC_URI = "git://github.com/jadonk/beaglebone-getting-started.git" S = "${WORKDIR}/git" @@ -18,3 +18,4 @@ do_install() { } FILES_${PN} += "${datadir}/${PN}" +INSANE_SKIP_${PN} = "file-rdeps" diff --git a/bsp/meta-ti/recipes-ti/beagleboard/gadget-init.bb b/bsp/meta-ti/recipes-ti/beagleboard/gadget-init.bb index 8b899c51..b546efbb 100644 --- a/bsp/meta-ti/recipes-ti/beagleboard/gadget-init.bb +++ b/bsp/meta-ti/recipes-ti/beagleboard/gadget-init.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Units to initialize usb gadgets" PR = "r19" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" COMPATIBLE_MACHINE = "(ti33x)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.76.03.01.bb b/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.82.01.19.bb index 8ebe2f3e..59652095 100644 --- a/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.76.03.01.bb +++ b/bsp/meta-ti/recipes-ti/bios/ti-sysbios_6.82.01.19.bb @@ -1,12 +1,10 @@ require recipes-ti/bios/ti-sysbios.inc -PV = "6_76_03_01" -PR = "r0" +PV = "6_82_01_19" -LIC_FILES_CHKSUM = "file://manifest_bios_${PV}.html;md5=5cf40699c51b26d36fc01647c0b27fb1" +LIC_FILES_CHKSUM = "file://manifest_bios_${PV}.html;md5=4b72066ed4cb1dd73ff2f585c428105a" -SRC_URI[sysbiosbin.md5sum] = "647243209d66d5dd35503b0ec5a84ab9" -SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a" +SRC_URI[sysbiosbin.sha256sum] = "4d7c6cac993e6bc601083a41a5c52089d4852544b4c38563e4320310a54882b2" TI_BIN_UNPK_CMDS = "" TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}" diff --git a/bsp/meta-ti/recipes-ti/devtools/gcc-aarch64-none-elf_9.2-2019.12.bb b/bsp/meta-ti/recipes-ti/devtools/gcc-aarch64-none-elf_9.2-2019.12.bb new file mode 100644 index 00000000..2ec0f9cf --- /dev/null +++ b/bsp/meta-ti/recipes-ti/devtools/gcc-aarch64-none-elf_9.2-2019.12.bb @@ -0,0 +1,38 @@ +# Copyright (C) 2020 Texas Instruments Inc. +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Baremetal GCC for Aarch64 processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc/GNU-Free-Documentation-License.html;md5=cc1e9a49a59ce7e6ae5ef37cd16eca0c" + +PROVIDES = "virtual/aarch64-none-elf-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-${PV}-x86_64-aarch64-none-elf.tar.xz" + +SRC_URI[sha256sum] = "36d2cbe7c2984f2c20f562ac2f3ba524c59151adfa8ee10f1326c88de337b6d1" + +S = "${WORKDIR}/gcc-arm-${PV}-x86_64-aarch64-none-elf" + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/aarch64-none-elf/ + cp -r ${S}/. ${D}${datadir}/aarch64-none-elf/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/aarch64-none-elf/bin/aarch64-none-elf-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +FILES_${PN} = "${datadir} ${bindir}" + +INSANE_SKIP_${PN} = "already-stripped libdir staticdev file-rdeps" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi-native_4.9.2015q3.bb b/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi-native_4.9.2015q3.bb deleted file mode 100644 index 1fe5c525..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi-native_4.9.2015q3.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Baremetal GCC for ARM" -LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=cba77c7fde3ed13e866b04a2f3d93918" - -inherit native -require recipes-ti/includes/ti-paths.inc - -SRC_URI = "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2;name=gcc-arm-none" - -SRC_URI[gcc-arm-none.md5sum] = "8a4a74872830f80c788c944877d3ad8c" -SRC_URI[gcc-arm-none.sha256sum] = "c50078bfbd29e6c15615900e746f4d0acde917338e55860b0f145f57387c12ab" - -S = "${WORKDIR}/gcc-arm-none-eabi-4_9-2015q3" - -do_install() { - install -d ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE} - cp -r ${S}/. ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE} -} - -FILES_${PN} = "${GCC_ARM_NONE_TOOLCHAIN_RECIPE}/*" - -INSANE_SKIP_${PN} = "already-stripped" diff --git a/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi_7-2018-q2-update.bb b/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi_7-2018-q2-update.bb deleted file mode 100644 index f474c87f..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi_7-2018-q2-update.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Baremetal GCC for ARM" -LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=f77466c63f5787f4bd669c402aabe061" - -require recipes-ti/includes/ti-paths.inc - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2;name=gcc-arm-none" - -SRC_URI[gcc-arm-none.md5sum] = "299ebd3f1c2c90930d28ab82e5d8d6c0" -SRC_URI[gcc-arm-none.sha256sum] = "bb17109f0ee697254a5d4ae6e5e01440e3ea8f0277f2e8169bf95d07c7d5fe69" - -S = "${WORKDIR}/gcc-arm-none-eabi-7-2018-q2-update" - -# only x86_64 is supported -COMPATIBLE_HOST = "x86_64.*-linux" -COMPATIBLE_HOST_class-target = "null" - -do_install() { - install -d ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE} - cp -r ${S}/. ${D}${GCC_ARM_NONE_TOOLCHAIN_RECIPE} -} - -FILES_${PN} = "${GCC_ARM_NONE_TOOLCHAIN_RECIPE}/*" - -INSANE_SKIP_${PN} = "already-stripped libdir staticdev build-deps file-rdeps" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi_9-2019-q4-major.bb b/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi_9-2019-q4-major.bb new file mode 100644 index 00000000..84f6dbab --- /dev/null +++ b/bsp/meta-ti/recipes-ti/devtools/gcc-arm-none-eabi_9-2019-q4-major.bb @@ -0,0 +1,39 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" + +PROVIDES = "virtual/arm-none-eabi-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/${BPN}-${PV}-x86_64-linux.tar.bz2" + +SRC_URI[md5sum] = "fe0029de4f4ec43cf7008944e34ff8cc" +SRC_URI[sha256sum] = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a" + +S = "${WORKDIR}/${BPN}-${PV}" + +COMPATIBLE_HOST = "x86_64.*-linux" + +do_install() { + install -d ${D}${datadir}/arm-none-eabi/ + cp -r ${S}/. ${D}${datadir}/arm-none-eabi/ + + install -d ${D}${bindir} + # Symlink all executables into bindir + for f in ${D}${datadir}/arm-none-eabi/bin/arm-none-eabi-*; do + lnr $f ${D}${bindir}/$(basename $f) + done +} + +FILES_${PN} = "${datadir} ${bindir}" + +INSANE_SKIP_${PN} = "already-stripped libdir staticdev file-rdeps" + +INHIBIT_SYSROOT_STRIP = "1" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/gcc-linaro-baremetal-aarch64-native.bb b/bsp/meta-ti/recipes-ti/devtools/gcc-linaro-baremetal-aarch64-native.bb deleted file mode 100644 index 97344f90..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/gcc-linaro-baremetal-aarch64-native.bb +++ /dev/null @@ -1,23 +0,0 @@ -include recipes-ti/devtools/gcc-linaro.inc - -PACKAGE_DIR = "gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_aarch64-elf" -S = "${WORKDIR}/${PACKAGE_DIR}" - -LIC_CHKSUM = "bc7fad4bba98e7a4cd5ab3042506493c" - -inherit native -require recipes-ti/includes/ti-paths.inc - -SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/7.2-${GCC_ARM_YEAR}/aarch64-elf/gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_aarch64-elf.tar.xz;name=gcc-linaro-aarch64" - -SRC_URI[gcc-linaro-aarch64.md5sum] = "4972f8943820bdd2f577f498de78964b" -SRC_URI[gcc-linaro-aarch64.sha256sum] = "30fb7d876bcb982c502057c593d9c1f11b35d5158a26d986718e2b998388c4c8" - -do_install() { - install -d ${D}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE} - cp -r ${S}/. ${D}${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE} -} - -FILES_${PN} = "${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE}/*" - -INSANE_SKIP_${PN} = "already-stripped" diff --git a/bsp/meta-ti/recipes-ti/devtools/gcc-linaro-baremetal-native.bb b/bsp/meta-ti/recipes-ti/devtools/gcc-linaro-baremetal-native.bb deleted file mode 100644 index 0268ae3d..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/gcc-linaro-baremetal-native.bb +++ /dev/null @@ -1,23 +0,0 @@ -include recipes-ti/devtools/gcc-linaro.inc - -PACKAGE_DIR = "gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_arm-eabi" -S = "${WORKDIR}/${PACKAGE_DIR}" - -LIC_CHKSUM = "bc7fad4bba98e7a4cd5ab3042506493c" - -inherit native -require recipes-ti/includes/ti-paths.inc - -SRC_URI = "https://releases.linaro.org/components/toolchain/binaries/7.2-${GCC_ARM_YEAR}/arm-eabi/gcc-linaro-${PV}-${GCC_ARM_YEAR}-x86_64_arm-eabi.tar.xz;name=gcc-linaro" - -SRC_URI[gcc-linaro.md5sum] = "9a4a39cfc78c84375b1160aa93587aed" -SRC_URI[gcc-linaro.sha256sum] = "45fc4f90af2e2e9c3197a275f6005ef5639f7a1889fa3eb24c3125ccd70fcd3d" - -do_install() { - install -d ${D}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE} - cp -r ${S}/. ${D}${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE} -} - -FILES_${PN} = "${GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE}/*" - -INSANE_SKIP_${PN} = "already-stripped" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm_20.2.0.bb index 9e651819..05b52e64 100644 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb +++ b/bsp/meta-ti/recipes-ti/devtools/ti-cgt-arm_20.2.0.bb @@ -1,8 +1,8 @@ SUMMARY = "TI ARM Code Generation Tools" HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" -LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Hewlett-Packard & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD & BSD-4-Clause" +LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://ti-cgt-arm_${PV}.LTS/README.txt;md5=79631eb21b2e5b7190cd3ff1dfd41108" +LIC_FILES_CHKSUM = "file://ti-cgt-arm_${PV}.LTS/README.html;md5=9ed980fae072af522545a0e5f297bca0" require recipes-ti/includes/ti-unpack.inc require recipes-ti/includes/ti-staging.inc @@ -27,8 +27,7 @@ do_install() { cp -r ${S}/ti-cgt-arm*/. ${D}${M4_TOOLCHAIN_INSTALL_DIR_RECIPE} } -SRC_URI[cgt_arm_installer.md5sum] = "e9e668332cf86c965b4da9d1d488426b" -SRC_URI[cgt_arm_installer.sha256sum] = "da976143128c619a278cb4214a4295c409d100f9e65ad2f4d0d1039db7cf98f4" +SRC_URI[cgt_arm_installer.sha256sum] = "e27b1ebae58085b1587af3016bf201b54b6ace99e9e7165c1e4a042afe4b55eb" BINFILE_NAME = "cgt_arm_installer" @@ -38,6 +37,6 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP_${PN} += "arch staticdev" +INSANE_SKIP_${PN} += "arch staticdev file-rdeps" BBCLASSEXTEND = "native nativesdk" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x.inc b/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x.inc deleted file mode 100644 index 1d00a553..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "TI DSP Code Generation Tools" -HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" -SECTION = "devel" -LICENSE = "TI" - -require ../includes/ti-paths.inc -require ../includes/ti-staging.inc -require ../includes/ti-eula-unpack.inc - -PR = "r4" - -S = "${WORKDIR}/cgt6x_${PV}" - -SRC_URI = "http://install.source.dir.local/ti_cgt_c6000_${PVwithdots}_setup_linux_x86.bin;name=cgt6xbin" - -BINFILE="ti_cgt_c6000_${PVwithdots}_setup_linux_x86.bin" -TI_BIN_UNPK_CMDS="Y:qY:workdir: : " -TI_BIN_UNPK_WDEXT="/cgt6x_${PV}" - -do_install() { - install -d ${D}${CODEGEN_INSTALL_DIR_RECIPE} - cp -pPrf ${S}/* ${D}${CODEGEN_INSTALL_DIR_RECIPE} -} - diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_6.1.20.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_6.1.20.bb deleted file mode 100644 index 1d6609c8..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_6.1.20.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ti-cgt6x.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62f46f1125a152a2e213b414db7ac600" - -PE = "1" -PV = "6_1_20" -PVwithdots = "6.1.20" - -SRC_URI[cgt6xbin.md5sum] = "39485ea8211960de0a958ab27106ab9b" -SRC_URI[cgt6xbin.sha256sum] = "a020142011c8160e24f6386f7696ecfbfe02dab2a6c83af74ce6b67eb1da9900" - diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_7.2.7.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_7.2.7.bb deleted file mode 100644 index a2266004..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_7.2.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -require ti-cgt6x.inc - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62f46f1125a152a2e213b414db7ac600" - -PE = "1" -PV = "7_2_7" -PVwithdots = "7.2.7" - -SRC_URI[cgt6xbin.md5sum] = "71a0768a541fdebd9c35d44301019d1d" -SRC_URI[cgt6xbin.sha256sum] = "211477f0142d603975544abe3c45cc3b77a3b38038158676c60812806378738b" - - -INSANE_SKIP_${PN} = "installed-vs-shipped" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_8.3.2.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_8.3.2.bb index deee61c7..38f5597d 100644 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_8.3.2.bb +++ b/bsp/meta-ti/recipes-ti/devtools/ti-cgt6x_8.3.2.bb @@ -100,5 +100,8 @@ FILES_${PN} += "${datadir}/ti/*" FILES_${PN}-dbg += "${datadir}/ti/cgt-c6x/bin/.debug" INSANE_SKIP_${PN} += "staticdev" +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${datadir}/ti/cgt-c6x/lib/libc.a" BBCLASSEXTEND = "native nativesdk" + +COMPATIBLE_MACHINE_class-target = "(ti-soc)" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-cgt7x_1.2.0.bb b/bsp/meta-ti/recipes-ti/devtools/ti-cgt7x_1.3.0.bb index 09178af8..55ec91e8 100644 --- a/bsp/meta-ti/recipes-ti/devtools/ti-cgt7x_1.2.0.bb +++ b/bsp/meta-ti/recipes-ti/devtools/ti-cgt7x_1.3.0.bb @@ -8,7 +8,7 @@ libraries and standard header files needed to produce a working DSP application. HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://ti-cgt-c7000_${PV}.STS/C7000_Code_Generation_Tools_1.x_manifest.html;md5=f1156d241d104c281bc64a6ec8eadc64" +LIC_FILES_CHKSUM = "file://ti-cgt-c7000_${PV}.STS/C7000_Code_Generation_Tools_1.x_manifest.html;md5=3ee1c9f774004535003f80cb8142bb0f" require recipes-ti/includes/ti-unpack.inc require recipes-ti/includes/ti-paths.inc @@ -25,8 +25,7 @@ SRC_URI = "http://software-dl.ti.com/codegen/esd/cgt_public_sw/C7000/${PV}.STS/$ TI_BIN_UNPK_ARGS = "--prefix ${S}" TI_BIN_UNPK_CMDS = "" -SRC_URI[cgt7x_x86_installer.md5sum] = "813840908f333dd2a31f92edec71c1fb" -SRC_URI[cgt7x_x86_installer.sha256sum] = "21379811a8857489f72ca8ec45a46eb086ced0bdbb58e78f73a86e63984ab2f5" +SRC_URI[cgt7x_x86_installer.sha256sum] = "24071fe0369e55af80e334852cda7fa78b64ae79a411c57ac6995470a7a23694" S = "${WORKDIR}/c7000_${PV}" @@ -35,10 +34,9 @@ do_install() { cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} } - FILES_${PN} += "${TI_CGT7X_INSTALL_DIR_RECIPE}" -INSANE_SKIP_${PN} += "arch staticdev textrel" +INSANE_SKIP_${PN} += "arch staticdev textrel file-rdeps" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools-common.inc b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools-common.inc index 27f8f908..c21e4794 100644 --- a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools-common.inc +++ b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools-common.inc @@ -60,6 +60,8 @@ libjvm.so \ libhpi.so \ lib.so \ libcairo.so.2 \ +libjli.so \ +libawt_xawt.so \ " COMPATIBLE_HOST ?= "null" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools/arm-linker-hack.diff b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools/arm-linker-hack.diff deleted file mode 100644 index 26debf8f..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools/arm-linker-hack.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/packages/gnu/targets/arm/linkcmd.xdt 2010-12-30 19:33:53.000000000 +0100 -+++ b/packages/gnu/targets/arm/linkcmd.xdt 2010-12-30 19:42:55.000000000 +0100 -@@ -40,12 +40,13 @@ - - %if ("BINVERS" in prog.build.target) { - % var _utils = xdc.loadCapsule("gnu/targets/linkUtils.xs"); -+% if (prog.build.target.GCCVERS < "4.3.3") { - SECTIONS { - `_utils.genSections(prog)` - } -- --% if (!prog.build.target.noStdLinkScript --% && prog.build.target.BINVERS >= "2.19") { -+% } -+% if (prog.build.target.noStdLinkScript -+% && prog.build.target.BINVERS >= "2.19") { - INSERT BEFORE .gnu.attributes - % } - diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff deleted file mode 100644 index 36142c47..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools/fix-hardcoded-paths.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur a/packages/gnu/targets/ITarget.xs b/packages/gnu/targets/ITarget.xs ---- a/packages/gnu/targets/ITarget.xs 2011-08-06 13:24:44.000000000 +0200 -+++ b/packages/gnu/targets/ITarget.xs 2011-08-06 13:23:37.000000000 +0200 -@@ -251,7 +251,7 @@ - - function askLd(target) - { -- var ldCmd = target.rootDir + "/" + target.GCCTARG + "/bin/ld"; -+ var ldCmd = target.rootDir + "/" + target.GCCTARG + "-ld"; - /* If the ld executable cannot be found, and the prefix is not used, - * it's probably a misspelled directory path. - */ -@@ -486,7 +486,7 @@ - tool2cmd["link"] = cmd; - - /* define the ar command template */ -- cmd = prefix + target.ar.cmd -+ cmd = prefix + target.GCCTARG + "-ar" - + " $(AROPTS_P) " + target.ar.opts - + " $@ $(AROPTS_S) $(aropts) $(files)"; - tool2cmd["ar"] = cmd; diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb deleted file mode 100644 index 74817835..00000000 --- a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb +++ /dev/null @@ -1,9 +0,0 @@ -require recipes-ti/devtools/ti-xdctools-core.inc - -PV = "3_55_02_22" -PR = "r0" - -LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;beginline=1;endline=140;md5=2e742b9757bc9ce0241aadba9f627ab8" - -SRC_URI[xdczip.md5sum] = "bb9154d677ce4724a5eac73817b23a0f" -SRC_URI[xdczip.sha256sum] = "bf90dfbbe298458c736d81d5631db25b335e79146923a4a50fab217e02723e7b" diff --git a/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.61.00.16.bb b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.61.00.16.bb new file mode 100644 index 00000000..9047198d --- /dev/null +++ b/bsp/meta-ti/recipes-ti/devtools/ti-xdctools_3.61.00.16.bb @@ -0,0 +1,7 @@ +require recipes-ti/devtools/ti-xdctools-core.inc + +PV = "3_61_00_16" + +LIC_FILES_CHKSUM = "file://docs/license/xdc/shelf/package.html;beginline=1;endline=140;md5=2e742b9757bc9ce0241aadba9f627ab8" + +SRC_URI[xdczip.sha256sum] = "19caf6d5ff412d48c11ba1c05b543e39f5d678203407e5f659ff306b274e7606" diff --git a/bsp/meta-ti/recipes-ti/engine-pkcs11/engine-pkcs11_git.bb b/bsp/meta-ti/recipes-ti/engine-pkcs11/engine-pkcs11_git.bb deleted file mode 100644 index 7dd6f096..00000000 --- a/bsp/meta-ti/recipes-ti/engine-pkcs11/engine-pkcs11_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "OpenSSL PKCS11 engine" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://src/engine_pkcs11.h;startline=1;endline=26;md5=471dacb7f0586e35729f422b8098585f" -SECTION = "libs" - -inherit autotools pkgconfig - -DEPENDS = "openssl10 libtool libp11" - -COMPATIBLE_MACHINE = "keystone" - -BRANCH = "master" - -PV = "1.3.0.1" -# Commit corresponds to DEV.ENGINE_PKCS11-01.03.00.01 -SRCREV = "56ac060e2245907a442376d586924af26ed7e478" - -SRC_URI = "git://git.ti.com/keystone-linux/engine-pkcs11.git;protocol=git;branch=${BRANCH}" -S = "${WORKDIR}/git" - -FILES_${PN} += "${libdir}/engines/*.so*" -FILES_${PN}-dbg += "${libdir}/engines/.debug" diff --git a/bsp/meta-ti/recipes-ti/includes/ti-paths.inc b/bsp/meta-ti/recipes-ti/includes/ti-paths.inc index 52a93cf5..d45b77fa 100644 --- a/bsp/meta-ti/recipes-ti/includes/ti-paths.inc +++ b/bsp/meta-ti/recipes-ti/includes/ti-paths.inc @@ -48,7 +48,7 @@ export XDC_INSTALL_DIR_RECIPE = "${installdir}/ti-xdctools-tree" export PDK_INSTALL_DIR_RECIPE = "${installdir}/ti-pdk-tree" export OSAL_INSTALL_DIR_RECIPE = "${installdir}/ti-osal-tree" export M4_TOOLCHAIN_INSTALL_DIR_RECIPE = "${installdir}/ti-cgt-arm" -export GCC_ARM_NONE_TOOLCHAIN_RECIPE = "${installdir}/gcc-arm-none-eabi" +export GCC_ARM_NONE_TOOLCHAIN_RECIPE = "${datadir}/arm-none-eabi" export TI_CGT_PRU_INSTALL_DIR_RECIPE = "${installdir}/cgt-pru" export MATHLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c66x-tree" export MATHLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c674x-tree" @@ -58,8 +58,8 @@ export CG_XML_INSTALL_DIR_RECIPE = "${installdir}/ti-cg-xml-tree" export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree" export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" 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 GCC_LINARO_BAREMETAL_TOOLCHAIN_RECIPE = "${datadir}/arm-none-eabi" +export GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN_RECIPE = "${datadir}/aarch64-none-elf" export TI_CGT7X_INSTALL_DIR_RECIPE = "${installdir}/cgt-c7x" diff --git a/bsp/meta-ti/recipes-ti/ipc/ipc-transport-qmss_git.bb b/bsp/meta-ti/recipes-ti/ipc/ipc-transport-qmss_git.bb index 4c9aaded..93136670 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ipc-transport-qmss_git.bb +++ b/bsp/meta-ti/recipes-ti/ipc/ipc-transport-qmss_git.bb @@ -15,3 +15,5 @@ do_install () { INSTALL_LIB_BASE_DIR=${D}${libdir} chown -R root:root ${D} } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libTransportQmss.a" diff --git a/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb b/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb index ca7f7b6c..6001585a 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb +++ b/bsp/meta-ti/recipes-ti/ipc/ipc-transport-srio_git.bb @@ -15,3 +15,5 @@ do_install () { INSTALL_LIB_BASE_DIR=${D}${libdir} chown -R root:root ${D} } + +INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libdir}/libTransportSrio.a" diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc index 86a0fd0c..449903f1 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-common.inc @@ -1,4 +1,4 @@ -PV = "3.50.04.08" +PV = "3.51.00.00" INC_PR = "r0" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -15,7 +15,6 @@ PLATFORM_k2g = "66AK2G" PLATFORM_omapl138 = "OMAPL138" PLATFORM_c667x-evm = "C6678" PLATFORM_c665x-evm = "C6678" -PLATFORM_am65xx = "AM65XX" ALT_PLATFORM_k2hk = "TCI6636" ALT_PLATFORM_am57xx-evm = "AM572X AM571X" diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-examples_git.bb b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-examples_git.bb index 43e45e64..c46e5c81 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-examples_git.bb +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-examples_git.bb @@ -3,8 +3,6 @@ require ti-ipc-examples.inc DEPENDS = "ti-ipc ti-xdctools-native ti-sysbios ti-ipc-rtos zip-native" -DEPENDS_append_am65xx = " sciclient-rtos" - do_compile_append() { if [ "${PLATFORM}" != "UNKNOWN" ]; then diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc index 4d0d449c..a68ba806 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos.inc @@ -24,9 +24,9 @@ protocol=${TI_IPC_METADATA_GIT_PROTOCOL};\ branch=${TI_IPC_METADATA_GIT_BRANCH};\ name=${TI_IPC_METADATA_NAME}" -# Corresponds to tag: 3.50.04.08 -TI_IPC_METADATA_SRCREV = "48788ea79190c4995df4c802e8aa4e17f332943d" -# Corresponds to tag: 3.50.04.08 +# Corresponds to tag: 3.51.00.00 +TI_IPC_METADATA_SRCREV = "1bf668fd6b0ec2ef6956fa55b8484d0b21a9f9e2" +# Corresponds to tag: 3.51.00.00 TI_IPC_EXAMPLES_SRCREV = "4707fcbbe0d136e781c4a7ffdc072be407c34358" SRCREV_FORMAT = "default" @@ -39,7 +39,7 @@ S_ipc-metadata = "${WORKDIR}/git/ipc-metadata" RELEASE_TYPE = "GA" RELEASE_SUFFIX = "" -PR = "${INC_PR}.r2" +PR = "${INC_PR}.r0" DEPENDS_append_keystone = " ti-cgt6x-native \ gcc-arm-none-eabi-native \ @@ -53,9 +53,6 @@ DEPENDS_append_omapl138 = " ti-cgt6x-native \ DEPENDS_append_c66x = " ti-cgt6x-native \ " -DEPENDS_append_am65xx = " ti-cgt-arm-native \ - gcc-linaro-baremetal-aarch64-native" - IPC_TARGETS = "" IPC_TARGETS_omap-a15 = "\ @@ -79,11 +76,6 @@ IPC_TARGETS_c66x = " \ ti.targets.elf.C66_big_endian="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" \ " -IPC_TARGETS_am65xx = "\ - gnu.targets.arm.A53F="${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN}" \ - ti.targets.arm.elf.R5F="${M4_TOOLCHAIN_INSTALL_DIR}" \ -" - PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}" EXTRA_OEMAKE = "\ PLATFORM=${PLATFORM} \ @@ -93,5 +85,4 @@ EXTRA_OEMAKE = "\ ${PARALLEL_XDC} \ JAVA_TOOL_OPTIONS=-Xss2560k \ " -EXTRA_OEMAKE_append_am65xx = " PDK_INSTALL_DIR=${PDK_INSTALL_DIR}" diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb index 4c0e71e6..b292d677 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb @@ -3,7 +3,6 @@ require ti-ipc-common.inc require ti-ipc-rtos.inc DEPENDS = "ti-xdctools-native ti-sysbios doxygen-native zip-native" -DEPENDS_append_am65xx = " sciclient-rtos" PACKAGES =+ "${PN}-fw" FILES_${PN}-fw = "${base_libdir}/firmware/*" @@ -62,12 +61,6 @@ do_compile() { fi } -do_install_prepend_am65xx () { - # Trim directory name - mv ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_false_R5F0 ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_R5F0 - mv ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_false_R5F1 ${S}/packages/ti/ipc/tests/bin/ti_platforms_cortexR_AM65X_R5F1 -} - do_install() { CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" IPC_VERSION=`echo ${PV}${RELEASE_SUFFIX} | sed -e 's|\.|_|g'` @@ -129,13 +122,3 @@ pkg_postinst_${PN}-fw_omapl138 () { pkg_postrm_${PN}-fw_omapl138 () { update-alternatives --remove rproc-dsp-fw ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674 } - -pkg_postinst_${PN}-fw_am65xx () { - update-alternatives --install /lib/firmware/am65x-mcu-r5f0_0-fw am65x-mcu-r5f0_0-fw ipc/ti_platforms_cortexR_AM65X_R5F0/messageq_single.xer5f ${ALTERNATIVE_PRIORITY} - update-alternatives --install /lib/firmware/am65x-mcu-r5f0_1-fw am65x-mcu-r5f0_1-fw ipc/ti_platforms_cortexR_AM65X_R5F1/messageq_single.xer5f ${ALTERNATIVE_PRIORITY} -} - -pkg_postrm_${PN}-fw_am65xx () { - update-alternatives --remove am65x-mcu-r5f0_0-fw ipc/ti_platforms_cortexR_AM65X_R5F0/messageq_single.xer5f - update-alternatives --remove am65x-mcu-r5f0_1-fw ipc/ti_platforms_cortexR_AM65X_R5F1/messageq_single.xer5f -} diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc b/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc index d1eaad2a..3b0115eb 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9 TI_IPC_GIT_URI = "git://git.ti.com/ipc/ipcdev.git" TI_IPC_GIT_PROTOCOL = "git" -TI_IPC_GIT_BRANCH = "3.50" +TI_IPC_GIT_BRANCH = "master" -#Corresponds to 3.50.04.08 -TI_IPC_SRCREV = "1d53b856338b86d1979fe09345c0b382913a848a" +#Corresponds to 3.51.00.00A +TI_IPC_SRCREV = "7a6e343a208d2849139b7272a67abc01db806e00" BRANCH = "${TI_IPC_GIT_BRANCH}" SRC_URI = "${TI_IPC_GIT_URI};protocol=${TI_IPC_GIT_PROTOCOL};branch=${BRANCH};name=ipcdev" diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc/0001-Add-kernel-build-dir.patch b/bsp/meta-ti/recipes-ti/ipc/ti-ipc/0001-Add-kernel-build-dir.patch index e612ddc1..71d5b2be 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc/0001-Add-kernel-build-dir.patch +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc/0001-Add-kernel-build-dir.patch @@ -1,4 +1,4 @@ -From 7d9f57983c6d14ac14f26987eddc555ea5c75d61 Mon Sep 17 00:00:00 2001 +From c3ada6bf49e6fcf7bc49e5bf09754f384838ca6a Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> Date: Mon, 27 Jul 2015 11:51:52 -0400 Subject: [PATCH] Add kernel build dir @@ -17,18 +17,18 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f0b4b61..9b5d07c 100644 +index 4d4a559..84ac78b 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,7 @@ AC_SUBST([AM_LDFLAGS]) - AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'OMAPL138' 'OMAP54XX' '66AK2E' 'TCI6630' 'TCI6636' 'TCI6638' '66AK2G' and 'DRA7XX'. If not defined all platforms will be built.) + AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'OMAPL138' 'OMAP54XX' '66AK2E' 'TCI6630' 'TCI6636' 'TCI6638' '66AK2G' 'DRA7XX' and 'AM65XX'. If not defined all platforms will be built.) AC_ARG_VAR(CMEM_INSTALL_DIR, Installation path directory to the CMEM libraries) AC_ARG_VAR(KERNEL_INSTALL_DIR, Installation path to the Linux kernel.) +AC_ARG_VAR(KERNEL_BUILD_DIR, Path to the Linux kernel build artifacts.) AC_ARG_VAR(AF_RPMSG, Address Family used by the RPMSG driver) AC_ARG_VAR(DRM_PREFIX, Installation location to the DRM library.) -@@ -111,6 +112,7 @@ AS_IF([test "x$PLATFORM" = "x"], [CMEM_INSTALL_DIR=]) +@@ -113,6 +114,7 @@ AS_IF([test "x$PLATFORM" = "x"], [CMEM_INSTALL_DIR=]) AC_SUBST([PLATFORM]) AC_SUBST([CMEM_INSTALL_DIR]) AC_SUBST([KERNEL_INSTALL_DIR]) @@ -36,7 +36,7 @@ index f0b4b61..9b5d07c 100644 AC_SUBST([AF_RPMSG]) AC_SUBST([DRM_PREFIX]) -@@ -127,6 +129,7 @@ AM_CONDITIONAL([DRA7XX], [test "x$PLATFORM" = "xDRA7XX"]) +@@ -130,6 +132,7 @@ AM_CONDITIONAL([AM65XX], [test "x$PLATFORM" = "xAM65XX"]) AM_CONDITIONAL([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"]) AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"]) AM_CONDITIONAL([KERNEL_INSTALL_DIR], [test -n "$KERNEL_INSTALL_DIR"]) @@ -44,7 +44,7 @@ index f0b4b61..9b5d07c 100644 AM_CONDITIONAL([DRM], [test "x$DRM_PREFIX" != "x"]) AM_CONDITIONAL([AF_RPMSG], [test -n "$AF_RPMSG"]) -@@ -157,6 +160,9 @@ You have configured to build for the '${PLATFORM}' platform +@@ -160,6 +163,9 @@ You have configured to build for the '${PLATFORM}' platform Your KERNEL installation directory is set to: '${KERNEL_INSTALL_DIR}' diff --git a/bsp/meta-ti/recipes-ti/ipc/ti-ipc_git.bb b/bsp/meta-ti/recipes-ti/ipc/ti-ipc_git.bb index 2ebd03fd..425ca4e1 100644 --- a/bsp/meta-ti/recipes-ti/ipc/ti-ipc_git.bb +++ b/bsp/meta-ti/recipes-ti/ipc/ti-ipc_git.bb @@ -22,7 +22,6 @@ DAEMON_k2l = "lad_tci6630" DAEMON_k2e = "lad_66ak2e" DAEMON_k2g = "lad_66ak2g" DAEMON_omapl138 = "lad_omapl138" -DAEMON_k3 = "lad_am65xx" inherit autotools-brokensep pkgconfig update-rc.d systemd diff --git a/bsp/meta-ti/recipes-ti/libp11/libp11_git.bb b/bsp/meta-ti/recipes-ti/libp11/libp11_git.bb deleted file mode 100644 index 9b1ea3e9..00000000 --- a/bsp/meta-ti/recipes-ti/libp11/libp11_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "PKCS11 abstraction library" -LICENSE = "LGPL2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" -SECTION = "libs" - -inherit autotools pkgconfig - -DEPENDS = "openssl10 libtool" -RDEPENDS_${PN} = "ti-softhsmv2" - -COMPATIBLE_MACHINE = "keystone" - -SRC_URI = "git://git.ti.com/keystone-linux/libp11.git;protocol=git;branch=${BRANCH}" -BRANCH = "master" -# Following commit corresponds to DEV.LIBP11-01.03.00.00 -SRCREV = "43c4f63a8d803fde2bcd8e4f8969e5fe9edf0e33" -PV = "1.3.0.0" - -S = "${WORKDIR}/git" diff --git a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb index f01d6513..7c3f9e1b 100644 --- a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb +++ b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "TI Multiproc Manager test code" +SUMMARY = "TI Multiproc Manager test code" include multiprocmgr.inc @@ -8,11 +8,6 @@ DEPENDS = "multiprocmgr cmem" RDEPENDS_${PN} = "multiprocmgr mpm-transport cmem" RDEPENDS_${PN} += "multiprocmgr-rtos-test bash" -CC += "-I${STAGING_KERNEL_DIR}/include" - -# Assuming the multiprocmgr kernel API is safe -CC[vardepsexclude] = "STAGING_KERNEL_DIR" - FILES_${PN} += "\ ${datadir}/ti/examples/mpm \ " diff --git a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc index 40a20af9..64fb6f6f 100644 --- a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc +++ b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr.inc @@ -9,10 +9,10 @@ MULTIPROCMGR_GIT_PROTOCOL = "git" MULTIPROCMGR_GIT_BRANCH = "master" # The following commits correspond to DEV.MPM-3.00.05.00 -MULTIPROCMGR_SRCREV = "f7fb3b7c21b3f6dd8b4adeef5df5be1824b9be73" +MULTIPROCMGR_SRCREV = "810d8a31c797d07abe808cb3fa89465fa934d4dd" PV = "3.0.5.0" -INC_PR = "r0" +INC_PR = "r1" BRANCH = "${MULTIPROCMGR_GIT_BRANCH}" SRC_URI = "${MULTIPROCMGR_GIT_URI};protocol=${MULTIPROCMGR_GIT_PROTOCOL};branch=${BRANCH}" diff --git a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch deleted file mode 100644 index 25deedcc..00000000 --- a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr/0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 17c307ff6e67af43f243366baa2ccc01f89cdddd Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Mon, 23 Apr 2018 15:35:44 -0400 -Subject: [PATCH] mpmdlif.c: don't hardcode kernel's "uapi" location - keystone_remoteproc.h - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> ---- - src/daemon/mpmdlif.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/mpmdlif.c b/src/daemon/mpmdlif.c -index 0c31604..d287bbc 100644 ---- a/src/daemon/mpmdlif.c -+++ b/src/daemon/mpmdlif.c -@@ -47,7 +47,7 @@ - #include <stdint.h> - - #define _LINUX_TYPES_H --#include "uapi/linux/keystone_remoteproc.h" -+#include "linux/keystone_remoteproc.h" - #include "internal/rsc_types.h" - //#include <elf.h> - // #define LOADER_DEBUG --- -2.7.4 - diff --git a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr_git.bb b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr_git.bb index 6143341d..07512603 100644 --- a/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr_git.bb +++ b/bsp/meta-ti/recipes-ti/multiprocmgr/multiprocmgr_git.bb @@ -1,11 +1,10 @@ -DESCRIPTION = "TI Multiproc Manager for KeyStone II" -SUMMARY = "Provides download, debug and other utilities for other cores in the SOC like DSP" +SUMMARY = "TI Multiproc Manager for KeyStone II" +DESCRIPTION = "Provides download, debug and other utilities for other cores in the SOC like DSP" include multiprocmgr.inc SRC_URI += " \ file://mpmsrv-daemon.service \ - file://0001-mpmdlif.c-don-t-hardcode-kernel-s-uapi-location-keys.patch \ " PR = "${INC_PR}.2" @@ -14,8 +13,6 @@ DEPENDS = "mpm-transport libdaemon virtual/kernel cmem" PACKAGE_ARCH = "${MACHINE_ARCH}" -CC += "-I${STAGING_KERNEL_DIR}/include -I${STAGING_KERNEL_DIR}/include/uapi" - INITSCRIPT_NAME = "mpmsrv-daemon.sh" INITSCRIPT_PARAMS = "defaults 10" diff --git a/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.61.01.01.bb b/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.61.01.01.bb deleted file mode 100644 index f120f2fe..00000000 --- a/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.61.01.01.bb +++ /dev/null @@ -1,16 +0,0 @@ -require ti-ndk.inc - -PV = "3_61_01_01" -PR = "r0" - -LIC_FILES_CHKSUM = "file://manifest_ndk_${PV}.html;md5=871c716abcf52bac5a7c23154eaba3b6" - -SRC_URI[ndkzip.md5sum] = "87f0494c9faee344fe93ae68e71ca189" -SRC_URI[ndkzip.sha256sum] = "3bfca50367432603ebc1d53d9185302bb4fa4558ac766696f086dc7a5a2ccd29" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_SYSROOT_STRIP = "1" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)" diff --git a/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.75.01.01.bb b/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.75.01.01.bb new file mode 100644 index 00000000..812fbb31 --- /dev/null +++ b/bsp/meta-ti/recipes-ti/ndk/ti-ndk_3.75.01.01.bb @@ -0,0 +1,14 @@ +require ti-ndk.inc + +PV = "3_75_01_01" + +LIC_FILES_CHKSUM = "file://manifest_ndk_${PV}.html;md5=ef952a30d0f1640e886bb4b60618f352" + +SRC_URI[ndkzip.sha256sum] = "fd2318f0490a3eb342bc16812f30394107f098a12704c11cd9a5dc3d5a0bba64" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_SYSROOT_STRIP = "1" + +COMPATIBLE_HOST ?= "null" +COMPATIBLE_HOST_ti-soc = "(.*)" diff --git a/bsp/meta-ti/recipes-ti/ns/ti-ns_2.60.01.06.bb b/bsp/meta-ti/recipes-ti/ns/ti-ns_2.60.01.06.bb deleted file mode 100644 index d86fcd5f..00000000 --- a/bsp/meta-ti/recipes-ti/ns/ti-ns_2.60.01.06.bb +++ /dev/null @@ -1,14 +0,0 @@ -require ti-ns.inc - -PV = "2_60_01_06" -PR = "r0" -SRC_URI = "http://software-dl.ti.com/targetcontent/ns/${PV}/exports/ns_${PV}.zip;name=nszip" - -LIC_FILES_CHKSUM = "file://manifest_ns_${PV}.html;md5=e15dc261b0ef14c6fbabba24abcde4f0" - -SRC_URI[nszip.md5sum] = "b78d86423e9c4d148be5fba5903cc2c7" -SRC_URI[nszip.sha256sum] = "f66b2fda6ab02585020e67d84897305209f3e141847581a214ccf123c3f15f00" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INHIBIT_SYSROOT_STRIP = "1" diff --git a/bsp/meta-ti/recipes-ti/ns/ti-ns_2.75.00.17.bb b/bsp/meta-ti/recipes-ti/ns/ti-ns_2.75.00.17.bb new file mode 100644 index 00000000..0d0bb544 --- /dev/null +++ b/bsp/meta-ti/recipes-ti/ns/ti-ns_2.75.00.17.bb @@ -0,0 +1,13 @@ +require ti-ns.inc + +PV = "2_75_00_17" + +SRC_URI = "http://software-dl.ti.com/targetcontent/ns/${PV}/exports/ns_${PV}.zip;name=nszip" + +LIC_FILES_CHKSUM = "file://manifest_ns_${PV}.html;md5=d6a172fb0625f2ddf7d0cbfded273898" + +SRC_URI[nszip.sha256sum] = "612cbaf9b91c978b39cf370f7ef721596c36141575ca74da76b025beef4d9a03" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_SYSROOT_STRIP = "1" diff --git a/bsp/meta-ti/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/bsp/meta-ti/recipes-ti/openmp-rtos/openmp-rtos_git.bb index 67d9edf5..0c93f354 100644 --- a/bsp/meta-ti/recipes-ti/openmp-rtos/openmp-rtos_git.bb +++ b/bsp/meta-ti/recipes-ti/openmp-rtos/openmp-rtos_git.bb @@ -4,6 +4,11 @@ LICENSE = "BSD" require recipes-ti/includes/ti-paths.inc +inherit features_check + +REQUIRED_MACHINE_FEATURES = "dsp" +REQUIRED_DISTRO_FEATURES = "openmp" + PV = "2_06_03_00" PR = "r0" diff --git a/bsp/meta-ti/recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb b/bsp/meta-ti/recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb deleted file mode 100644 index d281a515..00000000 --- a/bsp/meta-ti/recipes-ti/ti-softhsmv2/ti-softhsmv2_git.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "TI softhsmv2 package" -LICENSE = "BSD-2-Clause | BSD-3-Clause | ISC | IBM-License | FSFULLR | Zlib" -LIC_FILES_CHKSUM = "file://LICENSE;md5=700a883962ccff663f888f3f7221ce8f" -SECTION = "libs" - -mntdir = "/mnt" - -inherit autotools pkgconfig - -DEPENDS = "openssl10 libdaemon zlib" -COMPATIBLE_MACHINE = "keystone" - -BRANCH = "ti-softhsm-rebase" -SRC_URI = "git://git.ti.com/keystone-linux/ti-softhsmv2.git;protocol=git;branch=${BRANCH}" -#Following commit corresponds to tag DEV.SOFTHSM-02.00.00.00 -SRCREV = "b0eef602c03583e59c289ba113b64eaa4f5cac13" -PV = "2.0.0.0" -PR = "r0" - -S = "${WORKDIR}/git" - -CFLAGS += "-mno-unaligned-access" -CPPFLAGS += "-mno-unaligned-access" - -EXTRA_OECONF += " \ - --with-zlib=${STAGING_EXECPREFIXDIR} \ - --with-openssl=${STAGING_EXECPREFIXDIR} \ -" - -INITSCRIPT_NAME = "softhsm-daemon.sh" -INITSCRIPT_PARAMS = "defaults 10" - -inherit update-rc.d - -FILES_${PN} += "${libdir}/softhsm/lib*.so.* ${mntdir}/*" -FILES_${PN}-dbg += "${libdir}/softhsm/.debug" -FILES_${PN}-staticdev += "${libdir}/softhsm/*.a" -FILES_${PN}-dev += "${libdir}/softhsm/*.la ${libdir}/softhsm/lib*.so" - -INSANE_SKIP_${PN}-dev = "dev-elf" - -do_install_append() { - install -d ${D}${mntdir}/securedbv0 - install -d ${D}${mntdir}/securedbv1 - - install -d ${D}${sysconfdir}/init.d/ - install -c -m 755 ${S}/src/bin/daemon/softhsm-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} -} diff --git a/bsp/meta-ti/wic/sdimage-2part.wks b/bsp/meta-ti/wic/sdimage-2part.wks new file mode 100644 index 00000000..77d6f7b5 --- /dev/null +++ b/bsp/meta-ti/wic/sdimage-2part.wks @@ -0,0 +1,6 @@ +# short-description: Create SD card image with 2 partitions +# long-description: Creates a partitioned SD card image for TI platforms. +# Boot files are located in the first vfat partition with extra reserved space. + +part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --extra-space 100M --use-uuid +part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --use-uuid |