linux-ti-staging-rt: update to the latest

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

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
@@ -19,7 +19,5 @@ Please follow the recommended setup procedures of your OE distribution.
 
 
 Send pull requests, patches, comments or questions to meta-ti@yoctoproject.org
-Please note - meta-ti mailing list requires subscription for posting:
-https://lists.yoctoproject.org/listinfo/meta-ti
 
 Maintainers: Denys Dmytriyenko <denys@ti.com>

classes/ti-pdk-fetch.bbclass

@@ -1,46 +0,0 @@
-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 ?= "9c04a8f4ac2ed95100ee50163b3189d28b9680f1"
-
-TI_PDK_VERSION ?= "2020.4.16"
-
-PV = "${TI_PDK_VERSION}"
-
-TI_PDK_COMP ?= ""
-TI_PDK_COMP_PATH = "${@'${TI_PDK_COMP}'.replace('.','/')}"
-
-TI_PDK_SOURCE_PN = "ti-pdk-source"
-TI_PDK_SOURCE_WORKDIR = "${TMPDIR}/work-shared/ti-pdk-${PV}"
-TI_PDK_SOURCE = "${TI_PDK_SOURCE_WORKDIR}/git"
-
-S = "${WORKDIR}/git/${TI_PDK_COMP_PATH}"
-
-# Hard-link only required sources from PDK
-python do_unpack_append() {
-    if len(d.getVar('TI_PDK_COMP') or '') > 0:
-        import shutil
-
-        # Get src/dst paths
-        src = os.path.join(d.getVar('TI_PDK_SOURCE'),'packages',d.getVar('TI_PDK_COMP_PATH'))
-        s = d.getVar('S')
-
-        # Set up the directory structure, except for the root of the sources
-        # hard-linked.
-        bb.utils.mkdirhier(s)
-        os.rmdir(s)
-
-        # Recursively hard-link the sources
-        shutil.copytree(src, s, copy_function=os.link)
-
-        # Recursively hard-link the git directory
-        shutil.copytree(os.path.join(d.getVar('TI_PDK_SOURCE'),'.git'), os.path.join(s,'.git'), copy_function=os.link)
-}
-
-# Make sure that ti-pdk-source is unpacked before we set up the hardlinks.
-python __anonymous () {
-    pn = d.getVar('PN')
-    pdk_src_pn = d.getVar('TI_PDK_SOURCE_PN')
-    if pn != pdk_src_pn:
-        d.appendVarFlag('do_unpack', 'depends', ' ${TI_PDK_SOURCE_PN}:do_unpack')
-}

classes/ti-pdk.bbclass

@@ -1,144 +0,0 @@
-require recipes-ti/includes/ti-paths.inc
-require recipes-ti/includes/ti-staging.inc
-
-inherit perlnative
-
-DEPENDS = "ti-xdctools-native ti-cg-xml-native ti-sysbios common-csl-ip-rtos libxml-simple-perl-native gcc-arm-none-eabi-native ti-cgt6x-native ti-cgt-pru-native ti-pdk-build-rtos doxygen-native"
-
-DEPENDS_append_omap-a15 = " ti-cgt-arm-native"
-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"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-# HTML hyperlink text
-PDK_COMP_LINK_TEXT ?= ""
-
-DOC_FILE = "API_Documentation_${PN}.html"
-
-create_doc_link () {
-    PDK_COMP_DIR=`get_build_dir_bash`
-
-    echo "<a href=\"${PDK_COMP_DIR}/docs/doxygen/html/index.html\">${PDK_COMP_LINK_TEXT}</a>" >> ${D}${PDK_INSTALL_DIR_RECIPE}/packages/.extras/doc/${DOC_FILE}
-}
-
-get_build_dir_bash() {
-  if [ -f ${S}/package.xdc ]
-  then
-    grep '^package' ${S}/package.xdc | sed -e 's|\[.*$||' | awk '{ print $2 }' | sed -e 's|\.|/|g'
-  else
-    echo ${S}
-    return 1
-  fi
-}
-
-export CROSS_TOOL_PRFX="arm-none-eabi-"
-export TOOLCHAIN_PATH_A8 = "${GCC_ARM_NONE_TOOLCHAIN}"
-export TOOLCHAIN_PATH_A9 = "${GCC_ARM_NONE_TOOLCHAIN}"
-export TOOLCHAIN_PATH_A15 = "${GCC_ARM_NONE_TOOLCHAIN}"
-export TOOLCHAIN_PATH_M4 = "${M4_TOOLCHAIN_INSTALL_DIR}"
-export TOOLCHAIN_PATH_Arm9 = "${M4_TOOLCHAIN_INSTALL_DIR}"
-export C6X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
-export C7X_GEN_INSTALL_PATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c7x"
-export TOOLCHAIN_PATH_EVE = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-arp32"
-export CL_PRU_INSTALL_PATH = "${TI_CGT_PRU_INSTALL_DIR}"
-export TOOLCHAIN_PATH_GCC_ARCH64 = "${GCC_LINARO_BAREMETAL_AARCH64_TOOLCHAIN}"
-export TOOLCHAIN_PATH_R5 = "${M4_TOOLCHAIN_INSTALL_DIR}"
-
-export ROOTDIR = "${B}"
-export BIOS_INSTALL_PATH = "${SYSBIOS_INSTALL_DIR}"
-export XDC_INSTALL_PATH = "${XDC_INSTALL_DIR}"
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-
-export XDCPATH = "${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;${PDK_INSTALL_DIR}/packages"
-export SECTTI="perl ${CG_XML_INSTALL_DIR}/ofd/sectti.pl"
-
-TI_PDK_XDCMAKE ?= "1"
-
-# By default, only build the cores with available toolchains
-TI_PDK_LIMIT_CORES ?= "a15_0 ipu1_0 ipu1_1 ipu2_0 ipu2_1 mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66x c66xdsp_1 c66xdsp_2 c7x_1 arm9_0 c674x a9host a8host pru_0 pru_1"
-TI_PDK_LIMIT_SOCS ?= ""
-TI_PDK_LIMIT_BOARDS ?= ""
-TI_PDK_MAKE_TARGET ?= "release"
-TI_PDK_EXTRA_MAKE ?= ""
-TI_PDK_DOXYGEN_SUPPORT ?= "1"
-
-TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}"
-
-PARALLEL_XDC = "${@oe.utils.parallel_make_argument(d, '--jobs=%d')}"
-PARALLEL_MAKE = ""
-
-def get_doxygen_support(d):
-    if d.getVar('TI_PDK_DOXYGEN_SUPPORT') == '1':
-        return ''
-    return 'DOXYGEN_SUPPORT=no'
-
-EXTRA_OEMAKE = " \
-    LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" \
-    LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" \
-    LIMIT_CORES="${TI_PDK_LIMIT_CORES}" \
-    ${TI_PDK_EXTRA_MAKE} \
-    ${@get_doxygen_support(d)} \
-"
-
-do_configure() {
-    BUILD_DIR=${B}/`get_build_dir_bash`
-
-    mkdir -p ${BUILD_DIR}
-    cp -r ${S}/* ${BUILD_DIR}
-
-    if [ "${TI_PDK_XDCMAKE}" == "1" ]
-    then
-        cd ${BUILD_DIR}
-
-        sed -i "s/\ \"\.\\\\\\\\\"\ +//" src/Module.xs
-        find -name "*.xs" -exec sed -i "s/ofd6x\.exe/ofd6x/" {} \;
-        find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \;
-        find -name "*.xs" -exec sed -i "/\.chm/d" {} \;
-        find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \;
-
-        cd ${B}
-        ${XDC_INSTALL_DIR}/xdc clean ${PARALLEL_XDC} -PR .
-    else
-        if [ "${CLEANBROKEN}" != "1" ]
-        then
-            cd ${BUILD_DIR}
-            oe_runmake clean
-            cd "${B}"
-        fi
-    fi
-
-}
-
-do_compile() {
-
-    if [ "${TI_PDK_XDCMAKE}" == "1" ]
-    then
-        ${XDC_INSTALL_DIR}/xdc all ${PARALLEL_XDC} XDCARGS="${TI_PDK_XDC_ARGS}" ROOTDIR="${ROOTDIR}" -PR .
-        ${XDC_INSTALL_DIR}/xdc release XDCARGS="${TI_PDK_XDC_ARGS}" -PR .
-    else
-        BUILD_DIR=${B}/`get_build_dir_bash`
-        cd ${BUILD_DIR}
-
-        oe_runmake ${TI_PDK_MAKE_TARGET}
-    fi
-}
-
-do_install () {
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages \;
-    
-    if [ "${PDK_COMP_LINK_TEXT}" != "" ]
-    then
-        install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/.extras/doc
-        create_doc_link
-    fi
-}
-
-FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"

conf/layer.conf

@@ -8,15 +8,11 @@ BBFILE_COLLECTIONS += "meta-ti"
 BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti = "6"
 
-LAYERSERIES_COMPAT_meta-ti = "sumo thud"
-
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
-LAYERDEPENDS_meta-ti = "core"
-
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
-    ti-sgx-ddk-km \
-    ti-sgx-ddk-um \
+    omapdrm-pvr \
+    omap5-sgx-ddk-um-linux \
     ti-ipc \
     ti-ipc-rtos \
     cmem-mod \
@@ -25,9 +21,4 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
     debugss-module-drv \
     uio-module-drv \
     mpm-transport \
-    cppi-lld \
-    qmss-lld \
-    multiprocmgr \
 "
-
-HOSTTOOLS_NONFATAL += "truncate xxd comm"

conf/machine/am180x-evm.conf

@@ -0,0 +1,16 @@
+#@TYPE: Machine
+#@NAME: AM180x CPUs on an AM180x EVM board
+#@DESCRIPTION: Machine configuration for the TI AM180x EVM board
+
+require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
+
+UBOOT_MACHINE = "da850_am18xxevm_config"
+UBOOT_SUFFIX = "ais"
+
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+IMAGE_FSTYPES += "tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyS2"

conf/machine/am335x-evm.conf

@@ -4,14 +4,14 @@
 
 require conf/machine/include/ti33x.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubifs ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 
-# Normally AM335 boards use ttyS0, but ICE uses ttyS3, so try both
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+SERIAL_CONSOLE = "115200 ttyO0"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -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 4600"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -32,4 +32,4 @@ MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 10200"
 # 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"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"

conf/machine/am335x-hs-evm.conf

@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM335x HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM335x HS EVM
-
-require conf/machine/am335x-evm.conf
-
-UBOOT_MACHINE = ""
-# Last config in the list is default
-UBOOT_CONFIG ??= "uart mmc"
-UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
-UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am3x"

conf/machine/am3517-evm.conf

@@ -4,17 +4,17 @@
 
 require conf/machine/include/omap3.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"
 
 IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"
 USE_VT = "2"
 
-KERNEL_DEVICETREE = "am3517-evm.dtb"
-
 UBOOT_MACHINE = "am3517_evm_config"
 XLOAD_MACHINE = "am3517evm_config"
 

conf/machine/am37x-evm.conf

@@ -4,15 +4,15 @@
 
 require conf/machine/include/omap3.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"
 
 IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"
-
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyO0"
 
 # NOTE: there are NAND and OneNAND versions of this board...
 # do ubiattach /dev/ubi_ctrl -m 4

conf/machine/am437x-evm.conf

@@ -4,12 +4,14 @@
 
 require conf/machine/include/ti43x.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "ubifs ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyO0"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -22,7 +24,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 2200"
 
 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:

conf/machine/am437x-hs-evm.conf

@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM437x HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM437x HS EVM
-
-require conf/machine/am437x-evm.conf
-
-UBOOT_MACHINE = "am43xx_hs_evm_config"
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/am4x"
-
-OPTEEMACHINE = "ti"
-OPTEEFLAVOR = "am43xx"
-OPTEEOUTPUTMACHINE = "ti"

conf/machine/am57xx-evm.conf

@@ -1,26 +1,14 @@
 #@TYPE: Machine
-#@NAME: AM57xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM57xx EVM
+#@NAME: DRA7xx EVM
+#@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
 
 require conf/machine/include/dra7xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 
-SERIAL_CONSOLES = "115200;ttyS2"
-
-KERNEL_DEVICETREE = " \
-    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 \
-"
-
-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)}"
+SERIAL_CONSOLE = "115200 ttyO2"
 
 UBOOT_MACHINE = "am57xx_evm_config"
 
@@ -35,7 +23,7 @@ UBOOT_MACHINE = "am57xx_evm_config"
 # 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"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 6400"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -44,7 +32,3 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
 # UBI: sub-page size:              512
 # UBI: VID header offset:          2048 (aligned 2048)
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am571x am572x am574x"
-TI_PDK_LIMIT_BOARDS = "evmAM571x evmAM572x idkAM571x idkAM572x idkAM574x"

conf/machine/am57xx-hs-evm.conf

@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM57xx HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM57xx HS EVM
-
-require conf/machine/am57xx-evm.conf
-
-UBOOT_MACHINE = "am57xx_hs_evm_config"
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
-
-OPTEEMACHINE = "ti"
-OPTEEFLAVOR = "am57xx"
-OPTEEOUTPUTMACHINE = "ti"
-OPTEEPAGER = "y"

conf/machine/am65xx-evm.conf

@@ -1,36 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM65xx EVM
-
-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 \
-"
-
-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"

conf/machine/am65xx-hs-evm.conf

@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
-
-require conf/machine/am65xx-evm.conf
-
-UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
-
-OPTEEMACHINE = "k3"
-OPTEEFLAVOR = "am65x"
-OPTEEOUTPUTMACHINE = "k3"

conf/machine/beagle-x15.conf

@@ -1,38 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBoard X15
-#@DESCRIPTION: Machine configuration for the BeagleBoard X15
-
-require conf/machine/include/dra7xx.inc
-
-KERNEL_DEVICETREE = "am57xx-beagle-x15.dtb am57xx-beagle-x15-revb1.dtb am57xx-beagle-x15-revc.dtb"
-
-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"

conf/machine/beagleboard.conf

@@ -5,14 +5,12 @@
 require conf/machine/include/omap3.inc
 
 # Only has DVI connector for external screen
-MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"
 
-KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb"
-
-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"
 
 UBOOT_MACHINE = "omap3_beagle_config"
 

conf/machine/beaglebone.conf

@@ -1,25 +1,14 @@
 #@TYPE: Machine
 #@NAME: BeagleBone machine
-#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
 
 require conf/machine/include/ti33x.inc
 
-KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
-                    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
-                    am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb"
-
 # Only has DVI connector for external screen
-MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+IMAGE_FSTYPES += "tar.gz"
 
-WKS_FILE ?= "sdimage-bootpart.wks"
+SERIAL_CONSOLE = "115200 ttyO0"
 
-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
-TI_PDK_LIMIT_BOARDS = "bbbAM335x"
+UBOOT_MACHINE = "am335x_boneblack_config"

conf/machine/c665x-evm.conf

@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 1 c665x machine
-#@DESCRIPTION: Machine configuration for the TI Keystone 1 c665x EVM
-
-require conf/machine/include/c66x.inc
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "c6657"
-TI_PDK_LIMIT_BOARDS = "evmC6657"

conf/machine/c667x-evm.conf

@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 1 c667x machine
-#@DESCRIPTION: Machine configuration for the TI Keystone 1 c667x EVM
-
-require conf/machine/include/c66x.inc
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "c6678"
-TI_PDK_LIMIT_BOARDS = "evmC6678"

conf/machine/dra7xx-evm.conf

@@ -6,18 +6,9 @@ require conf/machine/include/dra7xx.inc
 
 MACHINE_FEATURES += "touchscreen"
 
-IMAGE_FSTYPES += "tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 
-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 \
-"
+SERIAL_CONSOLE = "115200 ttyO0"
 
 UBOOT_MACHINE = "dra7xx_evm_config"
 
@@ -32,7 +23,7 @@ UBOOT_MACHINE = "dra7xx_evm_config"
 # 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"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 6400"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -41,7 +32,3 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
 # UBI: sub-page size:              512
 # UBI: VID header offset:          2048 (aligned 2048)
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_BOARDS = "evmDRA72x evmDRA75x evmDRA78x"
-TI_PDK_LIMIT_SOCS = "dra72x dra75x dra78x"

conf/machine/dra7xx-hs-evm.conf

@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: DRA7xx HS EVM
-#@DESCRIPTION: Machine configuration for the TI DRA7xx HS EVM
-
-require conf/machine/dra7xx-evm.conf
-
-UBOOT_MACHINE = "dra7xx_hs_evm_config"
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
-
-OPTEEMACHINE = "ti"
-OPTEEFLAVOR = "dra7xx"
-OPTEEOUTPUTMACHINE = "ti"
-OPTEEPAGER = "y"

conf/machine/include/am65xx.inc

@@ -1,7 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am65xx"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am65xx"
-TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"

conf/machine/include/c66x.inc

@@ -1,9 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":c66x"
-
-# HACK: The c66x family is composed of devices with only DSP cores, and no ARM
-#       cores. The Linux kernel is not supported on these machines.
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
-EXTRA_IMAGEDEPENDS = ""
-
-IMAGE_FSTYPES = "tar.xz"

conf/machine/include/davinci.inc

@@ -1,13 +1,12 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r54"
+MACHINE_KERNEL_PR = "r53"
 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE = "uImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 UBOOT_MACHINE = "davinci_dvevm_config"
 
@@ -16,7 +15,7 @@ UBOOT_LOADADDRESS = "0x80008000"
 
 EXTRA_IMAGEDEPENDS += "u-boot"
 
-SERIAL_CONSOLES ?= "115200;ttyS0"
+SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"

conf/machine/include/k2e.inc

@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2e"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2e"
-TI_PDK_LIMIT_BOARDS = "evmK2E"

conf/machine/include/k2g.inc

@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2g"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2g"
-TI_PDK_LIMIT_BOARDS = "evmK2G iceK2G"

conf/machine/include/k2hk.inc

@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2hk"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2h k2k"
-TI_PDK_LIMIT_BOARDS = "evmK2H evmK2K"

conf/machine/include/k2l.inc

@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY_append = ":k2l"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2l"
-TI_PDK_LIMIT_BOARDS = "evmK2L"

conf/machine/include/k3.inc

@@ -1,33 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":k3"
-
-require conf/machine/include/arm/arch-arm64.inc
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-KERNEL_IMAGETYPE = "Image"
-KERNEL_IMAGETYPES = "Image vmlinux.gz"
-
-UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-SPL_BINARY = "tispl.bin"
-UBOOT_SUFFIX = "img"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
-MACHINE_GUI_CLASS = "smallscreen"
-
-# Use the expected value of the ubifs filesystem's volume name in the kernel
-# and u-boot.
-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

conf/machine/include/keystone.inc

@@ -1,7 +1,7 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":keystone"
+SOC_FAMILY = "keystone"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
+DEFAULTTUNE ?= "cortexa15thf-neon"
 require conf/machine/include/tune-cortexa15.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
@@ -16,9 +16,6 @@ KERNEL_IMAGETYPE = "zImage"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "bin"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
@@ -26,5 +23,5 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"
 EXTRA_IMAGEDEPENDS += "boot-monitor"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci"
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"

conf/machine/include/omap-a15.inc

@@ -1,7 +1,7 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap-a15"
+SOC_FAMILY = "omap-a15"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
+DEFAULTTUNE ?= "cortexa15thf-neon"
 require conf/machine/include/tune-cortexa15.inc
 
 # Increase this everytime you change something in the kernel
@@ -12,16 +12,11 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
 PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPES = "zImage uImage"
-KERNEL_CLASSES += "kernel-uimage"
 
 UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -29,11 +24,11 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"
 
-MACHINE_GUI_CLASS = "smallscreen"
+GUI_MACHINE_CLASS = "smallscreen"
 
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 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 sgx mmip"

conf/machine/include/omap3.inc

@@ -1,7 +1,7 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap3"
+SOC_FAMILY = "omap3"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
+DEFAULTTUNE ?= "cortexa8thf-neon"
 require conf/machine/include/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -10,23 +10,20 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-fbdev \
+           xf86-video-omapfb \
            xf86-input-keyboard"
 
 # Default to external video, change to smallscreen for built-in LCD
-MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r127"
+MACHINE_KERNEL_PR = "r126"
 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE = "uImage"
 
 # Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"
@@ -39,4 +36,4 @@ UBOOT_LOADADDRESS = "0x80008000"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # List common SoC features, may need to add touchscreen/ethernet for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa gpu"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa sgx"

conf/machine/include/omap4.inc

@@ -1,20 +1,20 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap4"
+SOC_FAMILY = "omap4"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
+DEFAULTTUNE ?= "cortexa9thf-neon"
 require conf/machine/include/tune-cortexa9.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
+           xserver-xorg-module-exa \
            xf86-input-evdev \
-           xf86-video-fbdev"
+           xf86-video-omap"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r4"
+MACHINE_KERNEL_PR = "r3"
 
 KERNEL_IMAGETYPE = "zImage"
 

conf/machine/include/omapl1.inc

@@ -1,2 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omapl1"

conf/machine/include/omapl137.inc

@@ -1,5 +0,0 @@
-require conf/machine/include/omapl1.inc
-SOC_FAMILY_append = ":omapl137"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "omapl137"

conf/machine/include/omapl138.inc

@@ -1,5 +1,2 @@
-require conf/machine/include/omapl1.inc
-SOC_FAMILY_append = ":omapl138"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "omapl138"
+SOC_FAMILY = "omapl138"
+require conf/machine/include/soc-family.inc

conf/machine/include/ti-soc.inc

@@ -1,4 +0,0 @@
-# This is a generic TI SOC family. It is a superset of all other SOCs
-# and platforms defined in meta-ti to allow BSP-level overrides.
-SOC_FAMILY = "ti-soc"
-require conf/machine/include/soc-family.inc

conf/machine/include/ti33x.inc

@@ -1,7 +1,7 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":ti33x"
+SOC_FAMILY = "ti33x"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
+DEFAULTTUNE ?= "cortexa8thf-neon"
 require conf/machine/include/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -14,7 +14,7 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 # Default to external video, change to smallscreen for built-in LCD
-MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r22"
@@ -26,26 +26,12 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "zImage"
 
-KERNEL_DEVICETREE = " \
-    am335x-evm.dtb am335x-evmsk.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 \
-"
-
-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"
-
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am335x_evm_config"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
@@ -53,8 +39,4 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
-
-# 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"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

conf/machine/include/ti43x.inc

@@ -1,7 +1,7 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":ti43x"
+SOC_FAMILY = "ti43x"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
+DEFAULTTUNE ?= "cortexa9thf-neon"
 require conf/machine/include/tune-cortexa9.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -14,7 +14,7 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 # Default to external video, change to smallscreen for built-in LCD
-MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r3"
@@ -26,23 +26,12 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 KERNEL_IMAGETYPE = "zImage"
 
-KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
-    am437x-sk-evm.dtb am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \
-"
-
-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
-
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am43xx_evm_config"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
 # Use the expected value of the ubifs filesystem's volume name in the kernel
 # and u-boot.
 UBI_VOLNAME = "rootfs"
@@ -50,8 +39,4 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am437x"
-TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

conf/machine/j7-evm.conf

@@ -1,37 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 EVM
-#@DESCRIPTION: Machine configuration for the TI J7 EVM
-
-require conf/machine/include/k3.inc
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-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-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"

conf/machine/k2e-evm.conf

@@ -2,17 +2,15 @@
 #@NAME: Keystone 2 K2E machine
 #@DESCRIPTION: Machine configuration for the TI Keystone 2 K2E EVM
 
-require conf/machine/include/k2e.inc
-
-KERNEL_DEVICETREE = "keystone-k2e-evm.dtb"
+require conf/machine/include/keystone.inc
 
 UBOOT_MACHINE = "k2e_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2e"
 
-IMAGE_FSTYPES += "ubifs ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz cpio"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

conf/machine/k2e-hs-evm.conf

@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 2 K2E HS EVM
-#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2E HS EVM
-
-require conf/machine/k2e-evm.conf
-
-UBOOT_MACHINE = "k2e_hs_evm_config"
-SPL_BINARY = ""
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/k2e"

conf/machine/k2g-evm.conf

@@ -2,20 +2,15 @@
 #@NAME: Keystone 2 K2G machine
 #@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G EVM
 
-require conf/machine/include/k2g.inc
-
-MACHINE_FEATURES += "alsa"
-
-KERNEL_DEVICETREE = "keystone-k2g-evm.dtb keystone-k2g-evm-lcd.dtb keystone-k2g-ice.dtb \
-                     ${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'keystone-k2g-ice-pru-excl-uio.dtb', '', d)}"
+require conf/machine/include/keystone.inc
 
 UBOOT_MACHINE = "k2g_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2g"
 
-IMAGE_FSTYPES += "ubifs ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz cpio"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

conf/machine/k2g-hs-evm.conf

@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 2 K2G HS EVM
-#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G HS EVM
-
-require conf/machine/k2g-evm.conf
-
-UBOOT_MACHINE = "k2g_hs_evm_config"
-SPL_BINARY = ""
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/k2g"

conf/machine/k2hk-evm.conf

@@ -2,17 +2,15 @@
 #@NAME: Keystone 2 K2HK machine
 #@DESCRIPTION: Machine configuration for the TI Keystone 2 K2HK EVM
 
-require conf/machine/include/k2hk.inc
-
-KERNEL_DEVICETREE = "keystone-k2hk-evm.dtb"
+require conf/machine/include/keystone.inc
 
 UBOOT_MACHINE = "k2hk_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2hk"
 
-IMAGE_FSTYPES += "ubifs ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz cpio"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

conf/machine/k2hk-hs-evm.conf

@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 2 K2HK HS EVM
-#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2HK HS EVM
-
-require conf/machine/k2hk-evm.conf
-
-UBOOT_MACHINE = "k2hk_hs_evm_config"
-SPL_BINARY = ""
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/k2hk"

conf/machine/k2l-evm.conf

@@ -2,17 +2,15 @@
 #@NAME: Keystone 2 K2L machine
 #@DESCRIPTION: Machine configuration for the TI Keystone 2 K2L EVM
 
-require conf/machine/include/k2l.inc
-
-KERNEL_DEVICETREE = "keystone-k2l-evm.dtb"
+require conf/machine/include/keystone.inc
 
 UBOOT_MACHINE = "k2l_evm_config"
 
 BOOT_MONITOR_MAKE_TARGET = "k2l"
 
-IMAGE_FSTYPES += "ubifs ubi tar.xz"
+IMAGE_FSTYPES += "ubi tar.gz cpio"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
 
 SYSVINIT_ENABLED_GETTYS = ""
 

conf/machine/k2l-hs-evm.conf

@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Keystone 2 K2L HS EVM
-#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2L HS EVM
-
-require conf/machine/k2l-evm.conf
-
-UBOOT_MACHINE = "k2l_hs_evm_config"
-SPL_BINARY = ""
-
-UBOOT_ENTRYPOINT = "0x82000000"
-UBOOT_LOADADDRESS = "0x82000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_CAT}/k2l"

conf/machine/lego-ev3.conf

@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: LEGO Mindstorms EV3
-#@DESCRIPTION: Machine configuration for the LEGO Mindstorms EV3
-
-require conf/machine/include/davinci.inc
-require conf/machine/include/omapl138.inc
-
-UBOOT_MACHINE = "legoev3_config"
-UBOOT_SUFFIX = "bin"
-UBOOT_ENTRYPOINT = "0xC0008000"
-UBOOT_LOADADDRESS = "0xC0008000"
-SPL_BINARY = ""
-
-KERNEL_DEVICETREE = "da850-lego-ev3.dtb"
-KERNEL_IMAGETYPES = "uImage"
-KERNEL_DEVICETREE_BUNDLE = "1"
-SERIAL_CONSOLES = "115200;ttyS1"
-
-IMAGE_FSTYPES += " wic"
-WKS_FILE ?= "sdimage-bootpart.wks"
-WIC_CREATE_EXTRA_ARGS += " --no-fstab-update"
-IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPES}"

conf/machine/omap3evm.conf

@@ -4,13 +4,15 @@
 
 require conf/machine/include/omap3.inc
 
-MACHINE_GUI_CLASS = "smallscreen"
+# Use built-in LCD by default
+XSERVER += "xf86-input-tslib"
+GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES += "touchscreen ethernet"
 
 IMAGE_FSTYPES += "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
 USE_VT = "0"
 
 EXTRA_IMAGEDEPENDS += "x-load"

conf/machine/omap5-evm.conf

@@ -6,9 +6,7 @@ require conf/machine/include/omap-a15.inc
 
 IMAGE_FSTYPES += "ubi tar.gz"
 
-KERNEL_DEVICETREE = "omap5-uevm.dtb"
-
-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
 # in your kernel port may require changes in these variables.  For more
@@ -21,7 +19,7 @@ SERIAL_CONSOLES = "115200;ttyS2"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4300"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4000"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:

conf/machine/omapl137-evm.conf

@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: OMAP-L137 EVM
-#@DESCRIPTION: Machine configuration for the TI OMAP-L137 EVM board
-
-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"
-EXTRA_IMAGEDEPENDS = ""
-
-IMAGE_FSTYPES = "tar.xz"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_BOARDS = "evmOMAPL137"

conf/machine/omapl138-lcdk.conf

@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: OMAP-L138 LCDK
-#@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board
-
-require conf/machine/include/davinci.inc
-require conf/machine/include/omapl138.inc
-
-UBOOT_MACHINE = "omapl138_lcdk_config"
-UBOOT_SUFFIX = "ais"
-SPL_BINARY = ""
-
-UBOOT_ENTRYPOINT = "0xc0008000"
-UBOOT_LOADADDRESS = "0xc0008000"
-
-IMAGE_FSTYPES += "tar.xz"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-KERNEL_DEVICETREE = "da850-evm.dtb da850-lcdk.dtb"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_BOARDS = "lcdkOMAPL138"

conf/machine/pandaboard.conf

@@ -4,13 +4,11 @@
 
 require conf/machine/include/omap4.inc
 
-MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 
 IMAGE_FSTYPES += "tar.gz"
 
-KERNEL_DEVICETREE = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"
-
-SERIAL_CONSOLES = "115200;ttyS2"
+SERIAL_CONSOLE = "115200 ttyO2"
 
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat gpu"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"

licenses/Thai-Open-Source-Software-Center

@@ -1,31 +0,0 @@
-Copyright (c) 2002, 2003, 2008 Thai Open Source Software Center Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    Neither the name of the Thai Open Source Software Center Ltd nor
-    the names of its contributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

recipes-bsp/aif2-lld/aif2-lld-rtos_git.bb

@@ -1,16 +0,0 @@
-SUMMARY = "TI RTOS low level driver for Antenna Interface"
-
-inherit ti-pdk
-
-require recipes-bsp/aif2-lld/aif2-lld.inc
-
-PR = "${INC_PR}.0"
-
-DEPENDS_append = " qmss-lld-rtos \
-                   cppi-lld-rtos \
-"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "AIF2 LLD"

recipes-bsp/aif2-lld/aif2-lld.inc

@@ -2,13 +2,21 @@ LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5bdceac872dffdec915b819654ee23ea"
 
-inherit ti-pdk-fetch
+AIF2_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/aif2-lld.git"
+AIF2_LLD_GIT_PROTOCOL = "git"
+AIF2_LLD_GIT_BRANCH = "master"
+AIF2_LLD_GIT_DESTSUFFIX = "git/ti/drv/aif2"
 
-TI_PDK_COMP = "ti.drv.aif2"
+# The following commit correspond to DEV.AIF2LLD.01.02.00.00A
+AIF2_LLD_SRCREV = "7f394ec9975cd4cef982b11763c882c4c763ddce"
 
-PE = "1"
+BRANCH = "${AIF2_LLD_GIT_BRANCH}"
+SRC_URI = "${AIF2_LLD_GIT_URI};destsuffix=${AIF2_LLD_GIT_DESTSUFFIX};protocol=${AIF2_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${AIF2_LLD_SRCREV}"
 
-INC_PR = "r0"
+PV = "1.2.0.0"
+INC_PR = "r1"
 
-COMPATIBLE_MACHINE = "k2hk"
+COMPATIBLE_MACHINE = "k2hk-evm"
 
+S = "${WORKDIR}/${AIF2_LLD_GIT_DESTSUFFIX}"

recipes-bsp/aif2-lld/aif2-lld_git.bb

@@ -14,5 +14,4 @@ do_compile () {
 
 do_install () {
     oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
-    chown -R root:root ${D}
 }

recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.2.bb

@@ -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"

recipes-bsp/audk2g-addon/audk2g-addon-rtos_git.bb

@@ -1,38 +0,0 @@
-SUMMARY = "TI RTOS Audio add-on software for k2g"
-
-inherit ti-pdk
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://audk2gaddonver.h;beginline=8;endline=47;md5=7a3996aaf1a3d3ca87358cf9b89bce3d"
-
-COMPATIBLE_MACHINE = "k2g"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-AUDK2G_ADDON_GIT_URI = "git://git.ti.com/processor-sdk/audk2g-addon.git"
-AUDK2G_ADDON_GIT_PROTOCOL = "git"
-AUDK2G_ADDON_GIT_BRANCH = "master"
-AUDK2G_ADDON_GIT_DESTSUFFIX = "git/ti/addon/audk2g"
-
-# Below commit ID corresponds to "DEV.AUDK2G.01.04.00.00"
-AUDK2G_ADDON_SRCREV = "815180b45ceb1fa3c110f9979106c7f5aa8b3ca2"
-
-BRANCH = "${AUDK2G_ADDON_GIT_BRANCH}"
-SRC_URI = "${AUDK2G_ADDON_GIT_URI};destsuffix=${AUDK2G_ADDON_GIT_DESTSUFFIX};protocol=${AUDK2G_ADDON_GIT_PROTOCOL};branch=${BRANCH}"
-
-SRCREV = "${AUDK2G_ADDON_SRCREV}"
-PV = "01.04.00.00"
-PR = "r0"
-
-S = "${WORKDIR}/git/ti/addon/audk2g"
-
-DEPENDS_append = " ti-sysbios \
-            gpio-lld-rtos \
-            i2c-lld-rtos \
-            board-rtos \
-"
-
-export PDK_AUDK2G_ROOT_PATH = "${WORKDIR}/build"
-export DEST_ROOT="${S}"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"

recipes-bsp/bcp-lld/bcp-lld-rtos_git.bb

@@ -1,23 +0,0 @@
-SUMMARY = "TI Bit Coprocessor (BCP) low level driver"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.bcp"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://bcp.h;beginline=1;endline=40;md5=4f6e6128dd075a89548c0287a39b8896"
-
-COMPATIBLE_MACHINE = "k2hk|k2l|c667x-evm"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r0"
-
-
-DEPENDS_append = " qmss-lld-rtos \
-                   cppi-lld-rtos \
-"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "BCP LLD"

recipes-bsp/board-rtos/board-rtos_git.bb

@@ -1,77 +0,0 @@
-SUMMARY = "TI RTOS Board Library"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.board"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://board.h;beginline=1;endline=32;md5=9bed8e4ac2fb37fc627cefe49eb1c919"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|omapl1|c66x|k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-
-
-PR = "r0"
-
-DEPENDS_append = " i2c-lld-rtos \
-                   spi-lld-rtos \
-                   uart-lld-rtos \
-                   osal-rtos \
-"
-
-DEPENDS_append_omap-a15 = " ti-ndk \
-                            mmcsd-lld-rtos \
-                            pm-lld-rtos \
-"
-
-DEPENDS_append_am57xx-evm = " gpio-lld-rtos \
-                              icss-emac-lld-rtos \
-                              pruss-lld-rtos \
-"
-
-
-DEPENDS_append_ti33x = " gpio-lld-rtos \
-                         gpmc-lld-rtos \
-                         icss-emac-lld-rtos \
-                         mmcsd-lld-rtos \
-                         pruss-lld-rtos \
-                         starterware-rtos \
-                         ti-ndk \
-"
-
-DEPENDS_append_ti43x = " gpio-lld-rtos \
-                         gpmc-lld-rtos \
-                         icss-emac-lld-rtos \
-                         mmcsd-lld-rtos \
-                         pruss-lld-rtos \
-                         starterware-rtos \
-                         ti-ndk \
-"
-
-DEPENDS_append_dra7xx = " pm-lld-rtos \
-                          mmcsd-lld-rtos \
-"
-
-DEPENDS_append_am65xx = " sciclient-rtos \
-                              pm-lld-rtos \
-"
-DEPENDS_append_j7-evm = " udma-lld-rtos \
-                          sciclient-rtos \
-                          mmcsd-lld-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-
-export PDK_BOARD_ROOT_PATH ="${WORKDIR}/build"
-export DEST_ROOT="${S}"
-
-XDCPATH_append = ";${PDK_INSTALL_DIR}/packages/ti/csl;${NDK_INSTALL_DIR}/packages"
-
-INSANE_SKIP_${PN} = "arch"

recipes-bsp/boot-monitor/boot-monitor_git.bb

@@ -5,21 +5,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25fe219a6febf6e5bb45beda1b2eb315"
 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-DEPENDS = "u-boot-mkimage-native"
-
 SRC_URI = "git://git.ti.com/processor-firmware/ks2-boot-monitor.git;protocol=git;branch=${BRANCH}"
 
-PV = "4.0+git${SRCPV}"
+PV = "3.0+git${SRCPV}"
+PR = "r1"
 
 BRANCH = "master"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "e1f885ab6dc544884728e333cc6e396f7eb08286"
+SRCREV = "035329caed63abe7193c855ad5d561ae783b19d7"
 
 BOOT_MONITOR_IMAGE  ?= "skern-${BOOT_MONITOR_MAKE_TARGET}.bin"
 
-FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}" LD="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}""
 

recipes-bsp/bt-fw/bt-fw_git.bb

@@ -1,24 +0,0 @@
-DESCRIPTION = "Firmware files for Bluetooth"
-LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f39eac9f4573be5b012e8313831e72a9"
-
-PV = "8.7.1+git${SRCPV}"
-
-CLEANBROKEN = "1"
-
-SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4"
-BRANCH = "master"
-SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    :
-}
-
-do_install() {
-    install -d ${D}${base_libdir}/firmware/ti-connectivity
-    oe_runmake "DEST_DIR=${D}" "BASE_LIB_DIR=${base_libdir}" install
-}
-
-FILES_${PN} += "${base_libdir}/firmware/ti-connectivity/*"

recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb

@@ -1,28 +0,0 @@
-SUMMARY = "Cadence MHDP DP bridge firmware"
-
-LICENSE = "BSD-3-Clause | Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0"
-
-PV = "1.2.17"
-PR = "r0"
-
-CLEANBROKEN = "1"
-
-COMPATIBLE_MACHINE = "j7-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRCREV = "7bad9a69a343e01056ece5ce6da4d4060c42f6bc"
-BRANCH ?= "ti-linux-firmware"
-
-SRC_URI = "git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-TARGET = "mhdp8546.bin"
-
-do_install() {
-	install -d ${D}${base_libdir}/firmware/cadence
-	install -m 0644 ${S}/cadence/${TARGET} ${D}${base_libdir}/firmware/cadence/${TARGET}
-}
-
-FILES_${PN} = "${base_libdir}/firmware"

recipes-bsp/cal-lld/cal-lld-rtos_git.bb

@@ -1,76 +0,0 @@
-SUMMARY = "TI RTOS low level driver for CAL"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.cal"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://cal.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a"
-
-COMPATIBLE_MACHINE = "k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-
-PR = "r0"
-
-DEPENDS_append = " osal-rtos \
-                   fvid2-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-CAL_PACKAGE_BASE   = "${WORKDIR}/cal_base"
-CAL_LLD_ROOTPATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/cal"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export PDK_CAL_ROOT_PATH = "${CAL_PACKAGE_BASE}/package/all/pdk_/packages"
-
-LIMSOCS = ""
-LIMSOCS_am65xx-evm = "am65xx"
-LIMSOCS_am65xx-hs-evm = "am65xx"
-
-LIMBOARDS = ""
-LIMBOARDS_am65xx-evm = "am65xx_evm"
-LIMBOARDS_am65xx-hs-evm = "am65xx_evm"
-
-BOARD_PACKAGE = ""
-BOARD_PACKAGE_am65xx-evm = "am65xx_evm"
-BOARD_PACKAGE_am65xx-hs-evm = "am65xx_evm"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "CAL"
-
-do_configure() {
-    rm -rf ${CAL_PACKAGE_BASE}
-    cd ${S}
-
-    # remove any previous package
-    rm -f ${CAL_PACKAGE_BASE}
-
-    # make the release package before building it
-    make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${CAL_PACKAGE_BASE} PDK_CAL_COMP_PATH=${S}
-}
-
-do_compile() {
-    echo "cal lld root path is ${CAL_LLD_ROOTPATH}"
-    cd ${CAL_LLD_ROOTPATH}
-
-    # Build am65xx libraries
-    make clean lib xdc_meta doxygen LIMIT_SOCS="${LIMSOCS}" LIMIT_BOARDS="${LIMBOARDS}"
-
-    #archive
-    tar -cf cal_lld.tar --exclude='*.tar' ./*
-}
-
-do_install() {
-    cd ${CAL_LLD_ROOTPATH}
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/cal \;
-}
-
-FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
-
-INSANE_SKIP_${PN} = "arch ldflags"

recipes-bsp/cm3-pm-firmware/am33x-cm3_git.bb

@@ -0,0 +1,29 @@
+DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
+
+PV = "1.9.0"
+PR = "r1"
+PE = "1"
+
+SRCREV = "d85e6a17da1025adac9ab7f97dd7aa2a58c517ce"
+BRANCH ?= "ti-v3.14.y"
+
+SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
+
+FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+
+do_compile() {
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}"
+}
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware
+	install -m 0644 bin/am335x-pm-firmware.elf ${D}${base_libdir}/firmware/
+	install -m 0644 bin/*-scale-data.bin ${D}${base_libdir}/firmware/
+}
+
+FILES_${PN} += "${base_libdir}/firmware"

recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb

@@ -1,20 +1,22 @@
 DESCRIPTION = "Cortex-M3 binary blob for suspend-resume"
 
-LICENSE = "TI-TSPA"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
 
-PV = "1.9.2"
-PR = "r0"
+PV = "1.9.1"
+PR = "r2"
 
-SRCREV = "fb484c5e54f2e31cf0a338d2927a06a2870bcc2c"
+SRCREV = "730f0695ca2dda65abcff5763e8f108517bc0d43"
 BRANCH ?= "ti-v4.1.y"
 
 SRC_URI = "git://git.ti.com/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 
+FLOATABI = "${@base_contains("TUNE_FEATURES", "vfp", base_contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
+
 do_compile() {
-	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}"
+	make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${FLOATABI}"
 }
 
 do_install() {
@@ -24,6 +26,3 @@ do_install() {
 }
 
 FILES_${PN} += "${base_libdir}/firmware"
-
-COMPATIBLE_MACHINE = "(ti-soc)"
-TOOLCHAIN = "gcc"

recipes-bsp/cmb-addon/cmb-addon-rtos_git.bb

@@ -1,41 +0,0 @@
-SUMMARY = "TI RTOS software supporting circular microphone array board"
-
-inherit ti-pdk
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://cmbaddonver.h;beginline=8;endline=47;md5=d0cb159bf210cfafed63042da01c83e0"
-
-COMPATIBLE_MACHINE = "k2g|omapl137-evm"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-CMB_ADDON_GIT_URI = "git://git.ti.com/processor-sdk/circmicarray-addon.git"
-CMB_ADDON_GIT_PROTOCOL = "git"
-CMB_ADDON_GIT_BRANCH = "master"
-CMB_ADDON_GIT_DESTSUFFIX = "git/ti/addon"
-
-# Below commit ID corresponds to "DEV.CMB.01.01.00.03A"
-CMB_ADDON_SRCREV = "3655aad07f17d3a167ec7dcecb52450c1d2fe8be"
-
-SRCREV = "${CMB_ADDON_SRCREV}"
-PV = "01.01.00.03A"
-PR = "r0"
-
-BRANCH = "${CMB_ADDON_GIT_BRANCH}"
-SRC_URI = "${CMB_ADDON_GIT_URI};destsuffix=${CMB_ADDON_GIT_DESTSUFFIX};protocol=${CMB_ADDON_GIT_PROTOCOL};branch=${BRANCH}"
-
-
-S = "${WORKDIR}/git/ti/addon/cmb"
-
-DEPENDS_append = " ti-sysbios \
-            gpio-lld-rtos \
-            i2c-lld-rtos \
-            mcasp-lld-rtos \
-            board-rtos \
-"
-
-export PDK_CMB_ROOT_PATH = "${WORKDIR}/build"
-export DEST_ROOT="${S}"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"

recipes-bsp/cmem/cmem-mod_git.bb

@@ -3,7 +3,7 @@ DESCRIPTION = "Kernel module for contiguous memory allocation from userspace"
 include cmem.inc
 
 # This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 inherit module
@@ -12,7 +12,3 @@ EXTRA_OEMAKE += '-f lu.mak KERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" TOOLCHAIN_
 MAKE_TARGETS = "module"
 
 KERNEL_MODULE_AUTOLOAD += "cmemk"
-
-do_install_prepend() {
-    cp ${B}/src/cmem/module/Module.symvers ${B}/ || true
-}

recipes-bsp/cmem/cmem.inc

@@ -1,16 +1,14 @@
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:CMEM"
 
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
+LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=9b745e2765a6ba8a636c91aed4b02ac1"
 
-BRANCH = "master"
-# This corresponds to version 4.16.00.00
-SRCREV = "4f970f053b42e8d2a6f1a8cd4b14786196468fd3"
+BRANCH ?= "lu-next"
+# This corresponds to version 4.10.02.03
+SRCREV = "00241c45f810c8b8e4f5ac66c3323fec8e43b621"
 
-PV = "4.16.00.00+git${SRCPV}"
+PV = "4.10.02.04+git${SRCPV}"
 
 SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST_ti-soc = "(.*)"

recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb

@@ -1,22 +1,36 @@
 require common-csl-ip.inc
-PR = "${INC_PR}.6"
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE_append = "|c66x|k3"
+PR = "${INC_PR}.0"
 
-inherit ti-pdk
+require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
 
-DEPENDS_remove = "${PN}"
+DEPENDS = "ti-xdctools ti-cgt6x-native ti-sysbios"
 
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
+CSL_GIT_DESTSUFFIX = "git/ti/csl"
 
-export PDK_CSL_ROOT_PATH ="${WORKDIR}/build"
-export DEST_ROOT="${S}"
+export C6X_GEN_INSTALL_PATH="${STAGING_DIR_NATIVE}/usr"
+export XDCCGROOT="${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
+export XDCPATH="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages"
 
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "CSL-Chip Support Library"
+do_configure() {
+    sed -i "s/\ \"\.\\\\\\\\\"\ +//" src/Module.xs
+    find -name "*.xs" -exec sed -i "s/ofd6x\.exe/ofd6x/" {} \;
+    find -name "*.xs" -exec sed -i "s/sectti\.exe/sectti/" {} \;
+    find -name "*.xs" -exec sed -i "/\.chm/d" {} \;
+    find -name "*.xs" -exec sed -i "s/pasm\_dos/pasm\_linux/" {} \;
+}
 
-# Workaround: dra7xx build requires am57xx CSL libraries for opencl-monitor
-TI_PDK_LIMIT_SOCS_append_dra7xx = " am571x am572x am574x"
-TI_PDK_LIMIT_BOARDS_append_dra7xx = " evmAM571x evmAM572x idkAM574x"
+do_compile() {
+    ${XDC_INSTALL_DIR}/xdc .make
+    ${XDC_INSTALL_DIR}/xdc clean
+    ${XDC_INSTALL_DIR}/xdc release
+}
+
+do_install () {
+    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages
+    find -name "*.tar" -exec tar xf {} -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages \;
+}
+
+ALLOW_EMPTY_${PN} = "1"
+FILES_${PN}-dev += "${PDK_INSTALL_DIR_RECIPE}/packages"

recipes-bsp/common-csl-ip/common-csl-ip.inc

@@ -2,19 +2,22 @@ DESCRIPTION = "Chip support library low level interface"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=5857833e20836213677fac33f9aded21"
 
-COMPATIBLE_MACHINE = "keystone|dra7xx|ti33x|ti43x|omapl1"
+COMPATIBLE_MACHINE = "keystone|dra7xx"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PV = "03.03.00.17B"
-INC_PR = "r0"
-PE = "1"
+INC_PR = "r4"
 
 CSL_GIT_URI = "git://git.ti.com/keystone-rtos/common-csl-ip.git"
 CSL_GIT_PROTOCOL ="git"
-CSL_GIT_BRANCH = "release"
+CSL_GIT_BRANCH = "master"
+CSL_GIT_BRANCH_dra7xx = "releases/PROCESSOR-SDK.01.00.00"
 CSL_GIT_DESTSUFFIX = "git"
 
-# Below commit ID corresponding to "DEV.CSL_PROCESSOR-SDK.03.03.00.17B"
-CSL_SRCREV = "a5a9200fe11575a4eff965d87cb968c5f3377e9f"
+# commit ID corresponds to DEV.CSL_KEYSTONE2.02.01.01.00A
+CSL_SRCREV = "17bb083f0d5ed4ad6f38c991210a6a8e9aaf9c56"
+
+# commit ID corresponds to PROCESSOR-SDK-ALPHA-1
+CSL_SRCREV_dra7xx = "37c5311ddf289f83b1432a9422816722d264bf55"
 
 BRANCH="${CSL_GIT_BRANCH}"
 SRC_URI = "${CSL_GIT_URI};protocol=${CSL_GIT_PROTOCOL};branch=${BRANCH};destsuffix=${CSL_GIT_DESTSUFFIX}"

recipes-bsp/common-csl-ip/common-csl-ip_git.bb

@@ -4,12 +4,6 @@ PR = "${INC_PR}.0"
 
 ALLOW_EMPTY_${PN} = "1"
 
-CLEANBROKEN = "1"
-
-do_compile() {
-    :
-}
-
 do_install () {
     install -d ${D}${includedir}/ti/csl
     find . -name "*.h" -type f | xargs -I {} cp --parents {} ${D}${includedir}/ti/csl

recipes-bsp/common-csl-ip/csl-rti-dwwdtest-fw_git.bb

@@ -1,77 +0,0 @@
-SUMMARY = "MCU Watchdog test firmware"
-DESCRIPTION = "Firmware for the R5F core to test the detection of watchdog timeout events to trigger SOC reset though DMSC."
-
-require recipes-bsp/common-csl-ip/common-csl-ip.inc
-require recipes-ti/includes/ti-paths.inc
-
-LIC_FILES_CHKSUM = "file://../../../COPYING.txt;md5=5857833e20836213677fac33f9aded21"
-
-S = "${WORKDIR}/${CSL_GIT_DESTSUFFIX}/example/rti/rti_dwwdtest_app"
-
-COMPATIBLE_MACHINE = "am65xx"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "ti-cgt-arm-native \
-           ti-pdk-build-rtos \
-           uart-lld-rtos \
-           board-rtos \
-           sciclient-rtos \
-           udma-lld-rtos"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-export TOOLCHAIN_PATH_R5 = "${M4_TOOLCHAIN_INSTALL_DIR}"
-
-EXTRA_OEMAKE = "WDT_RESET=enable DEST_ROOT=${S}"
-
-do_compile() {
-    for soc in ${TI_PDK_LIMIT_SOCS}
-    do
-        for board in ${TI_PDK_LIMIT_BOARDS}
-        do
-            oe_runmake SOC=$soc BOARD=$board
-        done
-    done
-}
-
-do_install() {
-    install -d ${D}${base_libdir}/firmware/rti_dwwdtest
-
-    for board in ${TI_PDK_LIMIT_BOARDS}
-    do
-        install -d ${D}${base_libdir}/firmware/rti_dwwdtest/$board
-        install -m 0644 csl_rti_dwwd_test_app/bin/$board/csl_rti_dwwd_test_app_mcu1_0_release.xer5f \
-                        ${D}${base_libdir}/firmware/rti_dwwdtest/$board
-    done
-}
-
-# Create separate package for each firmware so we can utilize
-# update-alternatives.
-PACKAGES =+ "${PN}-evm ${PN}-idk"
-RDEPENDS_${PN} = "${PN}-evm ${PN}-idk"
-ALLOW_EMPTY_${PN} = "1"
-
-FILES_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm"
-FILES_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk"
-
-# We are packaging R5 firmware
-INSANE_SKIP_${PN}-evm = "arch"
-INSANE_SKIP_${PN}-idk = "arch"
-
-# Configure update-alternatives as there may be other firmwares provided in an
-# image.
-inherit update-alternatives
-
-# It might be nice to dynamically declare the following based on
-# TI_PDK_LIMIT_BOARDS, but that is probably overkill.
-ALTERNATIVE_${PN}-evm = "am65x-mcu-r5f0_0-fw"
-ALTERNATIVE_${PN}-idk = "am65x-mcu-r5f0_0-fw"
-
-ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${base_libdir}/firmware/am65x-mcu-r5f0_0-fw"
-
-ALTERNATIVE_TARGET_${PN}-evm = "${base_libdir}/firmware/rti_dwwdtest/am65xx_evm/csl_rti_dwwd_test_app_mcu1_0_release.xer5f"
-ALTERNATIVE_TARGET_${PN}-idk = "${base_libdir}/firmware/rti_dwwdtest/am65xx_idk/csl_rti_dwwd_test_app_mcu1_0_release.xer5f"
-
-# Use a lesser priority than ipc example fw
-# See meta-ti/recipes-ti/ipc/ti-ipc-rtos_git.bb
-ALTERNATIVE_PRIORITY_${PN}-evm = "4"
-ALTERNATIVE_PRIORITY_${PN}-idk = "3"

recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb

@@ -1,10 +0,0 @@
-inherit ti-pdk
-require cppi-lld.inc
-
-PR = "${INC_PR}.1"
-
-COMPATIBLE_MACHINE_append = "|c66x"
-
-DEPENDS_append = " rm-lld-rtos \
-                   qmss-lld-rtos \
-"

recipes-bsp/cppi-lld/cppi-lld.inc

@@ -4,16 +4,24 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/ti/drv/cppi/COPYING.txt;md5=e8f6789acd
 COMPATIBLE_MACHINE = "keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit ti-pdk-fetch
+CPPI_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/cppi-lld.git"
+CPPI_LLD_GIT_PROTOCOL = "git"
+CPPI_LLD_GIT_BRANCH = "master"
+CPPI_LLD_GIT_DESTSUFFIX = "git/ti/drv/cppi"
 
-TI_PDK_COMP = "ti.drv.cppi"
+# Below Commit ID corresponds to "DEV.CPPI_LLD.02.01.00.10"
+CPPI_LLD_SRCREV = "97c537fa544a78e83512db3499a49d0bd86fad32"
 
-PE = "1"
+BRANCH = "${CPPI_LLD_GIT_BRANCH}"
+SRC_URI = "${CPPI_LLD_GIT_URI};destsuffix=${CPPI_LLD_GIT_DESTSUFFIX};protocol=${CPPI_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 
-INC_PR = "r0"
+SRCREV = "${CPPI_LLD_SRCREV}"
+PV = "02.01.00.10"
+INC_PR = "r3"
 
 DEVICELIST = "k2h k2k k2l k2e"
-DEVICELIST_k2hk = "k2h k2k"
-DEVICELIST_k2l  = "k2l"
-DEVICELIST_k2e  = "k2e"
+DEVICELIST_k2hk-evm = "k2h k2k"
+DEVICELIST_k2l-evm  = "k2l"
+DEVICELIST_k2e-evm  = "k2e"
 
+S = "${WORKDIR}/${CPPI_LLD_GIT_DESTSUFFIX}"

recipes-bsp/cppi-lld/cppi-lld_git.bb

@@ -16,8 +16,7 @@ do_compile () {
 }
 
 do_install () {
-    make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
-    chown -R root:root ${D}
+	make -f makefile_armv7 install PDK_INSTALL_PATH=${STAGING_INCDIR} INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
 
 #   Set the generic device library symbolic link to default k2h
     cd ${D}${libdir}

recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb

@@ -1,43 +0,0 @@
-SUMMARY = "R5 PSDK CPSW9G Ethernet Switch Firmware"
-
-LICENSE = "TI-TFL"
-LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=04ad0a015d4bb63c2b9e7b112debf3db"
-
-PV = "6.2+git${SRCPV}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit deploy
-inherit update-alternatives
-
-PROTOCOL = "git"
-BRANCH = "master"
-SRCREV = "4da71504488450f34d65459c1de949da1f984471"
-
-SRC_URI = "git://git.ti.com/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}"
-
-S = "${WORKDIR}/git"
-
-CPSW9G_FW_DIR = "${S}/ethfw"
-CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f"
-
-# 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
-# Ethernet firmware to be loaded on Main R5 core(needs read permission)
-  install -m 0644 ${CPSW9G_FW_DIR}/${CPSW9G_FW_FILENAME} ${D}${base_libdir}/firmware
-}
-
-TARGET_MAIN_R5FSS0_0 = "j7-main-r5f0_0-fw"
-ALTERNATIVE_${PN} = "j7-main-r5f0_0-fw"
-ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${TARGET_MAIN_R5FSS0_0}"
-ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${base_libdir}/firmware/${CPSW9G_FW_FILENAME}"
-ALTERNATIVE_PRIORITY = "17"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INSANE_SKIP_${PN} += "arch"
-
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"

recipes-bsp/cuia/cuia_1.0.0.13.bb

@@ -23,8 +23,3 @@ do_install() {
 	cd ${S}
 	oe_runmake DESTDIR=${D} libdir=${libdir} includedir=${includedir} install
 }
-
-COMPATIBLE_HOST ?= "null"
-COMPATIBLE_HOST_ti-soc = "(.*)"
-
-INSANE_SKIP_${PN} += "textrel"

recipes-bsp/dfe-lld/dfe-lld-rtos_git.bb

@@ -1,12 +0,0 @@
-SUMMARY = "TI RTOS level driver for Digital Radio Front End"
-
-inherit ti-pdk
-
-require recipes-bsp/dfe-lld/dfe-lld.inc
-
-PR = "${INC_PR}.0"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "DFE LLD"

recipes-bsp/dfe-lld/dfe-lld.inc

@@ -2,13 +2,21 @@ LICENSE = "BSD-3-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=1f4217b705bf98762a302fd720649dcc"
 
-inherit ti-pdk-fetch
+DFE_LLD_GIT_URI = "git://git.ti.com/keystone-rtos/dfe-lld.git"
+DFE_LLD_GIT_PROTOCOL = "git"
+DFE_LLD_GIT_BRANCH = "master"
+DFE_LLD_GIT_DESTSUFFIX = "git/ti/drv/dfe"
 
-TI_PDK_COMP = "ti.drv.dfe"
+# The following commit correspond to DEV.DFE_LLD.01.00.00.05E
+DFE_LLD_SRCREV = "42e9df0108d208c92b9d2fee7e8b1b1ab62f4b69"
 
-PE = "1"
+BRANCH = "${DFE_LLD_GIT_BRANCH}"
+SRC_URI = "${DFE_LLD_GIT_URI};destsuffix=${DFE_LLD_GIT_DESTSUFFIX};protocol=${DFE_LLD_GIT_PROTOCOL};branch=${BRANCH}"
+SRCREV = "${DFE_LLD_SRCREV}"
 
-INC_PR = "r0"
+PV = "1.0.0.5"
+INC_PR = "r1"
 
-COMPATIBLE_MACHINE = "k2l"
+COMPATIBLE_MACHINE = "k2l-evm"
 
+S = "${WORKDIR}/${DFE_LLD_GIT_DESTSUFFIX}"

recipes-bsp/dfe-lld/dfe-lld_git.bb

@@ -14,5 +14,4 @@ do_compile () {
 
 do_install () {
 	oe_runmake install INSTALL_INC_BASE_DIR=${D}/${includedir} INSTALL_LIB_BASE_DIR=${D}${libdir}
-	chown -R root:root ${D}
 }

recipes-bsp/dspdce-fw/dspdce-fw_git.bb

@@ -6,18 +6,19 @@ COMPATIBLE_MACHINE = "dra7xx"
 
 SRC_URI = "git://git.ti.com/glsdk/dspdce.git;protocol=git"
 
-SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8"
+SRCREV = "88705fd4584edd1289e4bb50658def936de90433"
 
-PV = "1.00.00.07"
+PV = "1.00.00.06"
 
 S = "${WORKDIR}/git"
 
 require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
 
-PR = "r4"
+PR = "r2"
 inherit update-alternatives
 
-DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ipc-rtos ti-osal ti-cgt6x-native"
+DEPENDS = "ti-xdctools ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ipc-rtos ti-osal ti-cgt6x-native"
 
 export HWVERSION = "ES10"
 export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
@@ -47,8 +48,8 @@ do_compile() {
 TARGET = "dra7-dsp1-fw.xe66"
 
 do_install() {
-    install -d ${D}${base_libdir}/firmware
-    install -m 0644 ${S}/dra7xx-c66x-dsp.xe66 ${D}${base_libdir}/firmware/${TARGET}.${BPN}
+        mkdir -p ${D}${base_libdir}/firmware
+        cp ${S}/dra7xx-c66x-dsp.xe66 ${D}${base_libdir}/firmware/${TARGET}.${BPN}
 }
 
 ALTERNATIVE_${PN} = "dra7-dsp1-fw.xe66"

recipes-bsp/dsptop/debugss-module-drv_git.bb

@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3"
 
 # This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "d"
+MACHINE_KERNEL_PR_append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 PV_append = "+git${SRCPV}"
 
@@ -14,7 +14,6 @@ inherit module
 PLATFORM = ""
 PLATFORM_dra7xx = "DRA7xx_PLATFORM"
 PLATFORM_keystone = "KEYSTONE_PLATFORM"
-PLATFORM_k2e = "K2E_PLATFORM"
 
 EXTRA_OEMAKE = "'PLATFORM=${PLATFORM}' KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
 

recipes-bsp/dsptop/dsptop.inc

@@ -1,7 +1,7 @@
-# This corresponds to version 1.4.0
-SRCREV = "25e823b04e62af224dce97b90359b7569ce3fbb5"
-PV = "1.4.0"
-INC_PR = "r1"
+# This corresponds to version 1.2.0
+SRCREV = "9893486936626e2d3de721f429a67fcac8a68151"
+PV = "1.2.0"
+INC_PR = "r0"
 
 SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"
 

recipes-bsp/dsptop/dsptop_git.bb

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979
 
 DEPENDS = "libulm ncurses"
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.0"
 
 S = "${WORKDIR}/git/dsptop"
 
@@ -12,7 +12,7 @@ DEVICE = ""
 DEVICE_dra7xx = "DRA7xx"
 DEVICE_keystone = "C66AK2Hxx"
 
-EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}""
+EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
 
 do_install() {
     oe_runmake install DESTDIR=${D}
@@ -21,8 +21,7 @@ do_install() {
 COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-RDEPENDS_${PN} = "debugss-module-drv bash"
-RDEPENDS_${PN}_append_keystone = " temperature-module-drv"
+RDEPENDS_${PN} = "debugss-module-drv"
 
 include dsptop.inc
 

recipes-bsp/dsptop/libulm_git.bb

@@ -14,7 +14,7 @@ DEVICE_keystone = "C66AK2Hxx"
 EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
 
 do_compile() {
-    oe_runmake arm XPORT_ONLY CC="${CC}"
+    oe_runmake arm XPORT_ONLY
     oe_runmake dsp C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include
 }
 

recipes-bsp/dsptop/temperature-module-drv_git.bb

@@ -1,18 +0,0 @@
-DESCRIPTION = "Smart Reflex Sub-System (SRSS) module driver for Keystone devices"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3"
-
-# This package builds a kernel module, use kernel PR as base and append a local
-MACHINE_KERNEL_PR_append = "a"
-PR = "${MACHINE_KERNEL_PR}"
-PV_append = "+git${SRCPV}"
-
-S = "${WORKDIR}/git/temperature_module/temperature-mod"
-
-inherit module
-
-EXTRA_OEMAKE = "KVERSION=${KERNEL_VERSION} KERNEL_SRC=${STAGING_KERNEL_DIR}"
-
-COMPATIBLE_MACHINE = "keystone"
-
-include dsptop.inc

recipes-bsp/edma3-lld/edma3-lld-rtos_git.bb

@@ -1,84 +1,29 @@
 require edma3-lld.inc
 require recipes-ti/includes/ti-paths.inc
+require recipes-ti/includes/ti-staging.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
-DEPENDS = "ti-sysbios ti-xdctools-native gcc-arm-none-eabi-native ti-cgt-arm-native ti-cgt6x-native"
+DEPENDS = "ti-cgt6x-native ti-sysbios ti-xdctools"
 
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|keystone|c66x|omapl1"
+COMPATIBLE_MACHINE = "dra7xx|keystone"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PLATFORMLIST = ""
-TARGETLIST = ""
-
-PLATFORMLIST_ti33x = " \
-        am335x-evm \
-"
-
-TARGETLIST_ti33x = " \
-        a8 \
-"
-
-PLATFORMLIST_ti43x = " \
-        am437x-evm \
-"
-
-TARGETLIST_ti43x = " \
-        arm9 \
-"
-
-PLATFORMLIST_omap-a15 = " \
-        tda2xx-evm \
-"
-
-TARGETLIST_omap-a15 = " \
-        66 \
-        a15 \
-        m4 \
-"
-
 PLATFORMLIST_keystone = " \
         tci6636k2h-evm \
         tci6638k2k-evm \
         tci6630k2l-evm \
         c66ak2e-evm \
-        tci66ak2g02-evm \
 "
 
-TARGETLIST_keystone = " \
-        66 \
-        a15 \
+PLATFORMLIST_dra7xx = " \
+        tda2xx-evm \
+        dra72x-evm \
+        am571x-evm \
+        am572x-evm \
 "
 
-PLATFORMLIST_append_dra7xx-evm = " \
-        tda3xx-evm \
-"
-
-TARGETLIST_c66x = " \
-        66 \
-"
-
-PLATFORMLIST_c665x-evm = " \
-        c6657-evm \
-"
-
-PLATFORMLIST_c667x-evm = " \
-        c6678-evm \
-"
-
-PLATFORMLIST_omapl1 = " \
-        omapl137-evm \
-        omapl138-evm \
-"
-
-TARGETLIST_omapl1 = " \
-        arm9 \
-        674 \
-"
-
-EXTRA_OEMAKE_remove = "TARGET=66"
-FORMAT="ELF"
-
 S = "${WORKDIR}/git"
 
 PARALLEL_MAKE = ""
@@ -89,7 +34,7 @@ export CGTOOLS = "${XDCCGROOT}"
 export CGTOOLS_ELF = "${XDCCGROOT}"
 export CODEGEN_PATH_DSP = "${XDCCGROOT}"
 export CODEGEN_PATH_DSPELF = "${XDCCGROOT}"
-export TMS470_CGTOOLS = "${M4_TOOLCHAIN_INSTALL_DIR}"
+export TMS470_CGTOOLS = "${XDCCGROOT}"
 export UTILS_INSTALL_DIR = "${XDC_INSTALL_DIR}"
 export XDCPATH = "${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages"
 export PATH := "${XDC_INSTALL_DIR}:${PATH}"
@@ -99,19 +44,10 @@ export CROSSCC="${TARGET_PREFIX}gcc"
 export CROSSAR="${TARGET_PREFIX}ar"
 export CROSSLNK="${TARGET_PREFIX}gcc"
 
+
+EXTRA_OEMAKE += " -C ${S}/packages TARGET=66 FORMAT=ELF"
+
 do_configure () {
-    rm -rf ${S}/examples/edma3_driver/evmTCI6614
-    rm -rf ${S}/examples/edma3_driver/evmTCI6614BE
-    sed -i -e "s|_config.bld|config.bld|g" ${S}/makerules/env.mk
-    sed -i -e "s|^edma3_lld_PATH =.*$|edma3_lld_PATH = ${S}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_M3 =.*$|CODEGEN_PATH_M3 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_M4 =.*$|CODEGEN_PATH_M4 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_A8 =.*$|CODEGEN_PATH_A8 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_A8_GCC =.*$|CODEGEN_PATH_A8_GCC = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_ARM9 =.*$|CODEGEN_PATH_ARM9 = ${M4_TOOLCHAIN_INSTALL_DIR}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_A9_GCC =.*$|CODEGEN_PATH_A9_GCC = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_A15 =.*$|CODEGEN_PATH_A15 = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
-    sed -i -e "s|^CODEGEN_PATH_A15_GCC =.*$|CODEGEN_PATH_A15_GCC = ${GCC_ARM_NONE_TOOLCHAIN}|g" ${S}/makerules/env.mk
     sed -i -e "s|^UTILS_INSTALL_DIR =.*$|UTILS_INSTALL_DIR = ${XDC_INSTALL_DIR}|g" ${S}/makerules/env.mk
     sed -i -e "s|^bios_PATH =.*$|bios_PATH = ${SYSBIOS_INSTALL_DIR}|g" ${S}/makerules/env.mk
     sed -i -e "s|^xdc_PATH =.*$|xdc_PATH = ${XDC_INSTALL_DIR}|g" ${S}/makerules/env.mk
@@ -123,23 +59,18 @@ do_configure () {
 }
 
 do_compile () {
-    cd ${S}/packages
     for p in ${PLATFORMLIST}
     do
-        for t in ${TARGETLIST}
-        do
-            make PLATFORM=${p} TARGET=${t} FORMAT=${FORMAT}
-        done
+        oe_runmake PLATFORM=${p}
     done
 }
 
 do_install () {
-    CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
     install -d ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
-    cp ${CP_ARGS} ${S}/* ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${EDMA3_LLD_INSTALL_DIR_RECIPE}
 }
 
-INSANE_SKIP_${PN}-dev = "arch ldflags file-rdeps"
+INSANE_SKIP_${PN}-dev = "arch"
 
 ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}-dev += "${EDMA3_LLD_INSTALL_DIR_RECIPE}"

recipes-bsp/edma3-lld/edma3-lld.inc

@@ -6,12 +6,12 @@ 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"
+# The following commit corresponds to tag DEV_EDMA3_LLD_02_12_01_21_RC1
+EDMA3_LLD_SRCREV = "562cba36ccd53e89e6979e99a58374513b543f93"
 
 BRANCH = "${EDMA3_LLD_GIT_BRANCH}"
 SRC_URI = "${EDMA3_LLD_GIT_URI};protocol=${EDMA3_LLD_GIT_PROTOCOL};branch=${BRANCH}"
 SRCREV = "${EDMA3_LLD_SRCREV}"
 
-PV = "2.12.05.30E"
-INC_PR = "r1"
+PV = "2.12.01.21"
+INC_PR = "r2"

recipes-bsp/edma3-lld/edma3-lld_git.bb

@@ -7,11 +7,9 @@ COMPATIBLE_MACHINE = "keystone"
 DEPENDS = "common-csl-ip"
 
 PLATFORMLIST = "tci6636k2h-evm \
-	tci6636k2h-evm \
 	tci6638k2k-evm \
 	tci6630k2l-evm \
 	c66ak2e-evm \
-	tci66ak2g02-evm \
 	"
 
 PACKAGES =+ "${PN}-test"
@@ -24,43 +22,41 @@ do_compile () {
 	cd ${S}/packages
 	for platform in ${PLATFORMLIST}
 	do
-		ROOTDIR=${S} CROSSCC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" CROSSAR="${TARGET_PREFIX}ar" \
-		CROSSLNK="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" INTERNAL_SW_ROOT="${S}" make \
+		ROOTDIR=${S} CROSSCC="${TARGET_PREFIX}gcc" CROSSAR="${TARGET_PREFIX}ar" \
+		CROSSLNK="${TARGET_PREFIX}gcc" INTERNAL_SW_ROOT="${S}" make \
 		PLATFORM="$platform" TARGET=a15 TOOLCHAIN_a15=GCC FORMAT=ELF \
 		SONAME=libedma3.so all
 	done
 }
 
 do_install () {
-	CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
-
 	install -d ${D}/${libdir}
 
 	# Static Libraries
-	cp ${CP_ARGS} ${S}/packages/ti/sdo/edma3/drv/lib/a15/release/edma3_lld_drv.aa15fg \
+	cp ${S}/packages/ti/sdo/edma3/drv/lib/a15/release/edma3_lld_drv.aa15fg \
 		${D}/${libdir}/libedma3.a
-	cp ${CP_ARGS} ${S}/packages/ti/sdo/edma3/rm/lib/tci6636k2h-evm/a15/release/edma3_lld_rm.aa15fg \
+	cp ${S}/packages/ti/sdo/edma3/rm/lib/tci6636k2h-evm/a15/release/edma3_lld_rm.aa15fg \
 		${D}/${libdir}/libedma3rm.a
 
 	# Shared Libraries
-	cp ${CP_ARGS} ${S}/packages/ti/sdo/edma3/drv/lib/a15/release/libedma* ${D}/${libdir}
-	cp ${CP_ARGS} ${S}/packages/ti/sdo/edma3/rm/lib/tci6636k2h-evm/a15/release/libedma* ${D}/${libdir}
+	cp -a ${S}/packages/ti/sdo/edma3/drv/lib/a15/release/libedma* ${D}/${libdir}
+	cp -a ${S}/packages/ti/sdo/edma3/rm/lib/tci6636k2h-evm/a15/release/libedma* ${D}/${libdir}
 
 	# Copy Headers
 	install -d ${D}/${includedir}/ti/sdo/edma3/drv/
 	install -d ${D}/${includedir}/ti/sdo/edma3/rm
-	cp ${CP_ARGS} ${S}/packages/ti/sdo/edma3/drv/*.h ${D}/${includedir}/ti/sdo/edma3/drv/
-	cp ${CP_ARGS} ${S}/packages/ti/sdo/edma3/rm/*.h ${D}/${includedir}/ti/sdo/edma3/rm/
+	cp ${S}/packages/ti/sdo/edma3/drv/*.h ${D}/${includedir}/ti/sdo/edma3/drv/
+	cp ${S}/packages/ti/sdo/edma3/rm/*.h ${D}/${includedir}/ti/sdo/edma3/rm/
 
 	# Copy Sample Config
 	install -d ${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
-	cp ${CP_ARGS} ${S}/examples/edma3_user_space_driver/evmTCI6636K2H/evmTCI6636K2HSample.c \
+	cp ${S}/examples/edma3_user_space_driver/evmTCI6636K2H/evmTCI6636K2HSample.c \
 		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
-	cp ${CP_ARGS} ${S}/examples/edma3_user_space_driver/evmTCI6638K2K/evmTCI6638K2KSample.c \
+	cp ${S}/examples/edma3_user_space_driver/evmTCI6638K2K/evmTCI6638K2KSample.c \
 		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
-	cp ${CP_ARGS} ${S}/examples/edma3_user_space_driver/evmTCI6630K2L/evmTCI6630K2LSample.c \
+	cp ${S}/examples/edma3_user_space_driver/evmTCI6630K2L/evmTCI6630K2LSample.c \
 		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
-	cp ${CP_ARGS} ${S}/examples/edma3_user_space_driver/evmC66AK2E/evmC66AK2ESample.c \
+	cp ${S}/examples/edma3_user_space_driver/evmC66AK2E/evmC66AK2ESample.c \
 		${D}/${includedir}/ti/sdo/edma3/drv/sample/src/platforms
 
 	install -d ${D}/${bindir}

recipes-bsp/emac-lld/emac-lld-rtos_git.bb

@@ -1,30 +0,0 @@
-SUMMARY = "TI RTOS low level driver for Ethernet MAC (EMAC) peripheral"
-
-inherit ti-pdk
-
-require emac-lld.inc
-
-PR = "r0"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://emacver.h;beginline=1;endline=47;md5=f66bb3695972ca2a85d990a390f45d88"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|c665x-evm|k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS_append = " board-rtos osal-rtos"
-DEPENDS_append_ti33x = " starterware-rtos"
-DEPENDS_append_ti43x = " starterware-rtos"
-DEPENDS_append_k2g  = " cppi-lld-rtos qmss-lld-rtos"
-
-DEPENDS_remove_k3 = "board-rtos "
-DEPENDS_append_k3 = " udma-lld-rtos trace-rtos"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-export PDK_EMAC_ROOT_PATH ="${WORKDIR}/build"
-export DEST_ROOT="${S}"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "EMAC LLD"

recipes-bsp/emac-lld/emac-lld.inc

@@ -1,7 +0,0 @@
-inherit ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.emac"
-
-PE = "1"
-
-# The LLD version

recipes-bsp/fatfs-rtos/fatfs-rtos_git.bb

@@ -1,28 +0,0 @@
-SUMMARY = "TI RTOS driver for FAT filesystem"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.fs.fatfs"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://FATFS.h;beginline=1;endline=32;md5=6619832755598d1cc2b01f2e6a1801d6"
-
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g|omapl1|k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r0"
-
-DEPENDS_append = " mmcsd-lld-rtos \
-                   osal-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-export PDK_FATFS_ROOT_PATH ="${WORKDIR}/build"
-export DEST_ROOT="${S}"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "FATFS Library"

recipes-bsp/faultmanagement/faultmanagement-rtos_git.bb

@@ -1,36 +0,0 @@
-SUMMARY = "TI Fault management module for keystone devices"
-
-inherit ti-pdk
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://fault_mgmt.h;beginline=1;endline=41;md5=4be5df2b9c314da729e9e4f6cc0b2979"
-
-COMPATIBLE_MACHINE = "k2hk|k2e|k2l"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-FAULT_MANAGEMENT_GIT_URI = "git://git.ti.com/keystone-rtos/fault_mgmt.git"
-FAULT_MANAGEMENT_GIT_PROTOCOL = "git"
-FAULT_MANAGEMENT_GIT_BRANCH = "master"
-FAULT_MANAGEMENT_GIT_DESTSUFFIX = "git/ti/instrumentation/fault_mgmt"
-
-# Below commit ID corresponds to "DEV.FAULT_MGMT.01.00.01.04A"
-FAULT_MANAGEMENT_SRCREV = "67becdff0e3d181ab7b8fada226f5737517c1c52"
-
-BRANCH = "${FAULT_MANAGEMENT_GIT_BRANCH}"
-SRC_URI = "${FAULT_MANAGEMENT_GIT_URI};destsuffix=${FAULT_MANAGEMENT_GIT_DESTSUFFIX};protocol=${FAULT_MANAGEMENT_GIT_PROTOCOL};branch=${BRANCH}"
-
-SRCREV = "${FAULT_MANAGEMENT_SRCREV}"
-PV = "01.00.01.04A"
-PR = "r0"
-
-S = "${WORKDIR}/${FAULT_MANAGEMENT_GIT_DESTSUFFIX}"
-
-DEPENDS_append_keystone = " qmss-lld-rtos \
-                            cppi-lld-rtos \
-                            pa-lld-rtos \
-"
-
-DEPENDS_append_k2hk = " aif2-lld-rtos \
-"
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "Fault Management"

recipes-bsp/fftc-lld/fftc-lld-rtos_git.bb

@@ -1,22 +0,0 @@
-SUMMARY = "TI FFT Coprocessor (FFTC) low level driver "
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.fftc"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://fftc.h;beginline=1;endline=39;md5=2f1010c47d364414644caf6d30a2b7df"
-
-COMPATIBLE_MACHINE = "k2hk|k2l"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r0"
-
-DEPENDS_append= " qmss-lld-rtos \
-                  cppi-lld-rtos \
-"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "FFTC LLD"

recipes-bsp/fvid2/fvid2-rtos_git.bb

@@ -1,68 +0,0 @@
-SUMMARY = "TI RTOS Video Driver Interface"
-
-inherit ti-pdk ti-pdk-fetch
-
-TI_PDK_COMP = "ti.drv.fvid2"
-
-PE = "1"
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://fvid2.h;beginline=1;endline=31;md5=83d177cf3df55c16b27ae4102b6ade9a"
-
-COMPATIBLE_MACHINE = "k3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r0"
-
-DEPENDS_append = " osal-rtos \
-"
-
-# Build with make instead of XDC
-TI_PDK_XDCMAKE = "0"
-
-FVID2_PACKAGE_BASE   = "${WORKDIR}/fvid2_base"
-FVID2_ROOTPATH = "${FVID2_PACKAGE_BASE}/package/all/pdk_/packages/ti/drv/fvid2"
-
-export PDK_INSTALL_PATH = "${PDK_INSTALL_DIR}/packages"
-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"
-
-# HTML doc link params
-PDK_COMP_LINK_TEXT = "FVID2"
-
-do_configure() {
-    rm -rf ${FVID2_PACKAGE_BASE}
-    cd ${S}
-
-    # remove any previous package
-    rm -f ${FVID2_PACKAGE_BASE}
-
-    # make the release package before building it
-    make package BOARD=${BOARD_PACKAGE} DEST_ROOT=${FVID2_PACKAGE_BASE} PDK_FVID2_COMP_PATH=${S}
-}
-
-do_compile() {
-    echo "fvid2 root path is ${FVID2_ROOTPATH}"
-    cd ${FVID2_ROOTPATH}
-
-    # Build am65xx libraries
-    make clean lib xdc_meta LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}"  LIMIT_CORES="${TI_PDK_LIMIT_CORES}"
-
-    #archive
-    tar -cf fvid2.tar --exclude='*.tar' ./*
-}
-
-do_install() {
-    cd ${FVID2_ROOTPATH}
-    install -d ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/fvid2
-    find -name "*.tar" -exec tar xf {} --no-same-owner -C ${D}${PDK_INSTALL_DIR_RECIPE}/packages/ti/drv/fvid2 \;
-}
-
-FILES_${PN} += "${PDK_INSTALL_DIR_RECIPE}/packages"
-
-INSANE_SKIP_${PN} = "arch ldflags"