keystone: config: fix K2L boot monitor build target name error

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

README

@@ -8,11 +8,7 @@ This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
 layers: meta
-branch: dunfell
-
-URI: git://git.yoctoproject.org/meta-arm
-layers: meta-arm
-branch: dunfell
+branch: master
 
 
 The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
@@ -22,12 +18,6 @@ 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@lists.yoctoproject.org
+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/g/meta-ti
-
-Maintainers:
-Ryan Eatmon <reatmon@ti.com>
-Denys Dmytriyenko <denys@konsulko.com>
+Maintainers: Denys Dmytriyenko <denys@ti.com>

classes/sdcard_image.bbclass

@@ -0,0 +1,156 @@
+inherit image
+
+# Add the fstypes we need
+IMAGE_FSTYPES_append = " tar.bz2 sdimg"
+
+# Ensure required utilities are present
+IMAGE_DEPENDS_sdimg = "genext2fs-native e2fsprogs-native"
+
+# Change this to match your host distro
+LOSETUP ?= "/sbin/losetup"
+
+# Since these need to go in /etc/fstab we can hardcode them
+# Since the vars are weakly assigned, you can override them from your local.conf
+LOOPDEV ?= "/dev/loop1"
+LOOPDEV_BOOT ?= "/dev/loop2"
+LOOPDEV_FS ?= "/dev/loop3"
+
+# Default to 4GiB images
+SDIMG_SIZE ?= "444" 
+
+# FS type for rootfs
+ROOTFSTYPE ?= "ext4"
+
+BOOTPARTNAME_beaglebone = "BEAGLE_BONE"
+BOOTPARTNAME ?= "${MACHINE}"
+
+IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
+
+# Files and/or directories to be copied into the vfat partition
+FATPAYLOAD ?= ""
+
+IMAGE_CMD_sdimg () {
+	SDIMG=${WORKDIR}/sd.img
+
+	# sanity check fstab entry for boot partition mounting
+	if [ "x$(cat /etc/fstab | grep ${LOOPDEV_BOOT} | grep ${WORKDIR}/tmp-mnt-boot | grep user || true)" = "x" ]; then
+		echo "/etc/fstab entries need to be created with the user flag for the loop devices like:"
+		echo "${LOOPDEV_BOOT} ${WORKDIR}/tmp-mnt-boot vfat user 0 0"
+        false
+	fi
+
+	# cleanup loops
+	for loop in ${LOOPDEV} ${LOOPDEV_BOOT} ${LOOPDEV_FS} ; do
+		${LOSETUP} -d $loop || true
+	done
+
+	# If an SD image is already present, reuse and reformat it
+	if [ ! -e ${SDIMG} ] ; then
+		dd if=/dev/zero of=${SDIMG} bs=$(echo '255 * 63 * 512' | bc) count=${SDIMG_SIZE}
+	fi
+
+	${LOSETUP} ${LOOPDEV} ${SDIMG}
+
+	# Create partition table
+	dd if=/dev/zero of=${LOOPDEV} bs=1024 count=1024
+	SIZE=$(/sbin/fdisk -l ${LOOPDEV} | grep Disk | grep bytes | awk '{print $5}')
+	CYLINDERS=$(echo $SIZE/255/63/512 | bc)
+	{
+	echo ,9,0x0C,*
+	echo ,,,-
+	} | /sbin/sfdisk -D -H 255 -S 63 -C ${CYLINDERS} ${LOOPDEV}
+
+	# Prepare loop devices for boot and filesystem partitions
+	BOOT_OFFSET=32256
+	FS_OFFSET_SECT=$(/sbin/fdisk -l -u ${LOOPDEV} 2>&1 | grep Linux | perl -p -i -e "s/\s+/ /"|cut -d " " -f 2)
+	FS_OFFSET=$(echo "$FS_OFFSET_SECT * 512" | bc)
+	FS_SIZE_BLOCKS=$(/sbin/fdisk -l -u ${LOOPDEV} 2>&1 | grep Linux | perl -p -i -e "s/\s+/ /g" \ 
+	|cut -d " " -f 4 | cut -d "+" -f 1)
+ 
+	LOOPDEV_BLOCKS=$(/sbin/fdisk -l -u ${LOOPDEV} 2>&1 | grep FAT | perl -p -i -e "s/\s+/ /g"|cut -d " " -f 5)
+	LOOPDEV_BYTES=$(echo "$LOOPDEV_BLOCKS * 1024" | bc)
+
+	${LOSETUP} -d ${LOOPDEV}
+
+	${LOSETUP} ${LOOPDEV_BOOT} ${SDIMG} -o ${BOOT_OFFSET} 
+
+	/sbin/mkfs.vfat ${LOOPDEV_BOOT} -n ${BOOTPARTNAME} $LOOPDEV_BLOCKS
+
+	# Prepare filesystem partition
+	# Copy ubi used by flashing scripts
+	if [ -e  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ] ; then
+		echo "Copying UBIFS image to file system"
+		cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${IMAGE_ROOTFS}/boot/fs.ubi
+	fi
+
+	# Prepare boot partion. First mount the boot partition, and copy the boot loader and supporting files
+	# from the root filesystem
+
+	mkdir -p ${WORKDIR}/tmp-mnt-boot
+	mount $LOOPDEV_BOOT ${WORKDIR}/tmp-mnt-boot
+
+	echo "Copying bootloaders into the boot partition"
+	if [ -e ${IMAGE_ROOTFS}/boot/MLO ] ; then
+		cp -v ${IMAGE_ROOTFS}/boot/MLO ${WORKDIR}/tmp-mnt-boot 
+	else
+		cp -v ${DEPLOY_DIR_IMAGE}/MLO ${WORKDIR}/tmp-mnt-boot
+	fi
+
+	# Check for u-boot SPL
+	if [ -e ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.img ] ; then
+		suffix=img
+	else
+		suffix=bin
+	fi
+
+	cp -v ${IMAGE_ROOTFS}/boot/uEnv.txt ${WORKDIR}/tmp-mnt-boot || true
+	cp -v ${IMAGE_ROOTFS}/boot/user.txt ${WORKDIR}/tmp-mnt-boot || true
+	cp -v ${IMAGE_ROOTFS}/boot/uImage ${WORKDIR}/tmp-mnt-boot || true
+
+	if [ -e ${IMAGE_ROOTFS}/boot/u-boot.$suffix ] ; then
+		cp -v ${IMAGE_ROOTFS}/boot/{u-boot.$suffix} ${WORKDIR}/tmp-mnt-boot || true
+	else
+		cp -v ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.$suffix ${WORKDIR}/tmp-mnt-boot/u-boot.$suffix 
+	fi
+
+	if [ -n ${FATPAYLOAD} ] ; then
+		echo "Copying payload into VFAT"
+		for entry in ${FATPAYLOAD} ; do
+				# add the || true to stop aborting on vfat issues like not supporting .~lock files
+				cp -av ${IMAGE_ROOTFS}$entry ${WORKDIR}/tmp-mnt-boot || true
+		done
+	fi
+
+	echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${IMAGE_ROOTFS}/etc/image-version-info
+
+	# Cleanup VFAT mount
+	echo "Cleaning up VFAT mount"
+	umount ${WORKDIR}/tmp-mnt-boot
+	${LOSETUP} -d ${LOOPDEV_BOOT} || true
+
+	# Prepare rootfs parition
+	echo "Creating rootfs loopback"
+	${LOSETUP} ${LOOPDEV_FS} ${SDIMG} -o ${FS_OFFSET}
+
+	FS_NUM_INODES=$(echo $FS_SIZE_BLOCKS / 4 | bc)
+
+	case "${ROOTFSTYPE}" in
+		ext3)
+				genext2fs -z -N $FS_NUM_INODES -b $FS_SIZE_BLOCKS -d ${IMAGE_ROOTFS} ${LOOPDEV_FS}
+				tune2fs -L ${IMAGE_NAME} -j ${LOOPDEV_FS}
+				;;
+		ext4)
+				genext2fs -z -N $FS_NUM_INODES -b $FS_SIZE_BLOCKS -d ${IMAGE_ROOTFS} ${LOOPDEV_FS}
+				tune2fs -L ${IMAGE_NAME} -j -O extents,uninit_bg,dir_index ${LOOPDEV_FS}
+				;;
+		*)
+				echo "Please set ROOTFSTYPE to something supported"
+				exit 1
+				;;
+	esac
+
+	${LOSETUP} -d ${LOOPDEV_FS} || true
+
+	gzip -c ${WORKDIR}/sd.img > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-${IMAGEDATESTAMP}.img.gz
+	rm -f ${WORKDIR}/sd.img
+}

classes/ti-pdk-fetch.bbclass

@@ -1,47 +0,0 @@
-TI_PDK_GIT_URI ?= "git://git.ti.com/git/processor-sdk/pdk.git"
-TI_PDK_GIT_BRANCH ?= "master"
-TI_PDK_GIT_PROTOCOL ?= "https"
-TI_PDK_SRCREV ?= "a1ace885998e9adbcbbd0abf8b9ded6ba9ec54ff"
-
-TI_PDK_VERSION ?= "2020.5.6"
-
-PV = "${TI_PDK_VERSION}"
-PE = "2"
-
-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}'.rstrip('/')}"
-
-# 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-baremetal-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-baremetal-native ti-cgt6x-native"
-DEPENDS_append_am65xx = " ti-cgt-arm-native gcc-linaro-baremetal-aarch64-native"
-DEPENDS_remove_j7 = "gcc-arm-baremetal-native"
-DEPENDS_append_j7 = " 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

@@ -1,6 +1,5 @@
 # We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-METATIBASE := '${@os.path.normpath("${LAYERDIR}/")}'
+BBPATH =. "${LAYERDIR}:"
 
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
@@ -8,28 +7,3 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 BBFILE_COLLECTIONS += "meta-ti"
 BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-ti = "6"
-
-LAYERSERIES_COMPAT_meta-ti = "dunfell"
-
-LICENSE_PATH += "${LAYERDIR}/licenses"
-
-LAYERDEPENDS_meta-ti = " \
-    core \
-    meta-arm \
-"
-
-SIGGEN_EXCLUDERECIPES_ABISAFE += " \
-    ti-sgx-ddk-km \
-    ti-sgx-ddk-um \
-    cmem-mod \
-    hplib-mod \
-    gdbserverproxy-module-drv \
-    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,18 @@
+#@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 = "da850evm_config"
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+IMAGE_FSTYPES += "tar.gz ubi"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omapl138-psp"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am180x"
+PREFERRED_PROVIDER_u-boot = "u-boot-am180x"

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"
+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 9900"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -32,4 +32,4 @@ MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 9900"
 # 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,16 +4,21 @@
 
 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.xz"
+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"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am3517"
+PREFERRED_PROVIDER_u-boot = "u-boot-am3517"
 
 UBOOT_MACHINE = "am3517_evm_config"
 XLOAD_MACHINE = "am3517evm_config"

conf/machine/am37x-evm.conf

@@ -4,15 +4,19 @@
 
 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.xz"
+IMAGE_FSTYPES += "ubi tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-KERNEL_DEVICETREE = "omap3-evm-37xx.dtb"
+SERIAL_CONSOLE = "115200 ttyO0"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-am37x"
+PREFERRED_PROVIDER_u-boot = "u-boot-am37x"
 
 # 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"
+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 4800"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 994"
 
 # 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-am43xx"
-OPTEEFLAVOR = "am43xx"
-OPTEEOUTPUTMACHINE = "ti"

conf/machine/am57xx-evm.conf

@@ -1,58 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM57xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM57xx EVM
-
-require conf/machine/include/dra7xx.inc
-
-MACHINE_FEATURES += "touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
-    am5729-beagleboneai.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm.dtb', d)} \
-    ti/am57xx-evm-common.dtbo \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am57xx-evm-reva3.dtb', d)} \
-    ti/am57xx-evm-reva3.dtbo \
-    am571x-idk.dtb \
-    ti/am571x-idk-touchscreen.dtbo \
-    am572x-idk.dtb \
-    am574x-idk.dtb \
-    ti/am57xx-idk-osd-lcd-common.dtbo \
-    ti/am572x-idk-touchscreen.dtbo \
-    ti/lcd-osd101t2587.dtbo \
-    ti/lcd-osd101t2045.dtbo \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'ti/ov10635.dtbo', d)} \
-"
-
-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
-
-UBOOT_MACHINE = "am57xx_evm_config"
-
-# 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"
-
-# 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-am57xx"
-OPTEEFLAVOR = "am57xx"
-OPTEEOUTPUTMACHINE = "ti"
-OPTEEPAGER = "y"

conf/machine/am62axx-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62AXX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62Axx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62ax"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62ax_evm_r5_defconfig"

conf/machine/am62axx-evm.conf

@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62AXX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM
-
-require conf/machine/include/am62axx.inc
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am62a7-sk.dtb \
-    ti/k3-am62a7-fpdlink-ov2312-0-0.dtbo \
-    ti/k3-am62a7-fpdlink-ov2312-0-1.dtbo \
-    ti/k3-am62a7-fpdlink-ov2312-0-2.dtbo \
-    ti/k3-am62a7-fpdlink-ov2312-0-3.dtbo \
-    ti/k3-am62a7-fpdlink-sk-fusion.dtbo \
-    ti/k3-am62a7-sk-csi2-imx219.dtbo \
-    ti/k3-j721e-fpdlink-imx390-cm-0-0.dtbo \
-    ti/k3-j721e-fpdlink-imx390-cm-0-1.dtbo \
-    ti/k3-j721e-fpdlink-imx390-cm-0-2.dtbo \
-    ti/k3-j721e-fpdlink-imx390-cm-0-3.dtbo \
-    ti/k3-j721e-fpdlink-imx390-rcm-0-0.dtbo \
-    ti/k3-j721e-fpdlink-imx390-rcm-0-1.dtbo \
-    ti/k3-j721e-fpdlink-imx390-rcm-0-2.dtbo \
-    ti/k3-j721e-fpdlink-imx390-rcm-0-3.dtbo \
-"
-
-UBOOT_MACHINE = "am62ax_evm_a53_defconfig"

conf/machine/am62xx-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"

conf/machine/am62xx-evm.conf

@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX EVM
-
-require conf/machine/include/am62xx.inc
-
-MACHINE_FEATURES += "gpu"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am625-sk.dtb \
-    ti/k3-am625-skeleton.dtb \
-    ti/k3-am625-sk-lpmdemo.dtb \
-    ti/k3-am625-sk-csi2-ov5640.dtbo \
-    ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \
-    ti/k3-am625-sk-ecap-capture.dtbo \
-    ti/k3-am625-sk-hdmi-audio.dtbo \
-    ti/k3-am625-sk-mcan.dtbo \
-    ti/k3-am625-sk-oldi-panel.dtbo \
-"
-
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"

conf/machine/am62xx-lp-evm-k3r5-hs-se.conf

@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62xx LPSK HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx LP HS-SE EVM (R5F core)
-
-# Booting HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-hs-se"
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"

conf/machine/am62xx-lp-evm-k3r5.conf

@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX LP GP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx LP GP EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-gp"
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"

conf/machine/am62xx-lp-evm.conf

@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX LP EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-
-require conf/machine/include/am62xx-lp.inc
-
-MACHINE_FEATURES += "gpu"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am62x-lp-sk.dtb \
-    ti/k3-am625-skeleton.dtb \
-    ti/k3-am625-sk-lpmdemo.dtb \
-    ti/k3-am625-sk-csi2-ov5640.dtbo \
-"
-
-SPL_BINARY = "tispl.bin_HS"	
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"
-
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"

conf/machine/am64xx-evm-k3r5-gp.conf

@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx GP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx GP EVM (R5F core)
-
-# Booting GP requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-gp"
-
-SYSFW_SOC = "am64x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-gp-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-gp.${UBOOT_SUFFIX}"

conf/machine/am64xx-evm-k3r5-sr2-hs-fs.conf

@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx SR2.0 HS-FS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-FS EVM (R5F core)
-
-# Booting SR2.0 HS-FS requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-sr2-hs-fs"
-
-SYSFW_SOC = "am64x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"

conf/machine/am64xx-evm-k3r5-sr2-hs-se.conf

@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx SR2.0 HS-SE EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM64xx SR2.0 HS-SE EVM (R5F core)
-
-# Booting SR2.0 HS-SE requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/include/k3r5.inc
-SOC_FAMILY_append = ":k3r5-sr2-hs-se"
-
-SYSFW_SOC = "am64x_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-SYSFW_TIBOOT3_SYMLINK = ""
-
-UBOOT_MACHINE = "am64x_evm_r5_defconfig"
-
-SPL_BINARY = ""
-UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-sr2-hs-se-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-sr2-hs-se.${UBOOT_SUFFIX}"

conf/machine/am64xx-evm.conf

@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM64xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM64xx EVM
-
-require conf/machine/include/am64xx.inc
-
-UBOOT_MACHINE = "am64x_evm_a53_defconfig"

conf/machine/am65xx-evm-k3r5-sr2.conf

@@ -1,11 +0,0 @@
-#@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"

conf/machine/am65xx-evm-k3r5.conf

@@ -1,18 +0,0 @@
-#@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 = ""
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "am65x_evm_r5_defconfig"

conf/machine/am65xx-evm.conf

@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM65xx EVM
-
-require conf/machine/include/am65xx.inc
-
-UBOOT_MACHINE = "am65x_evm_a53_defconfig"

conf/machine/am65xx-hs-evm-k3r5-sr2.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx SR2.0 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM65xx SR2.0 HS EVM (R5F core)
-
-# Booting SR2 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/am65xx-hs-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr2"
-
-SYSFW_SOC = "am65x_sr2"
-SYSFW_SYMLINK = "sysfw.itb"

conf/machine/am65xx-hs-evm-k3r5.conf

@@ -1,18 +0,0 @@
-#@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"
-SYSFW_SYMLINK = ""
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig"

conf/machine/am65xx-hs-evm.conf

@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM65xx HS EVM
-#@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
-
-require conf/machine/include/am65xx.inc
-
-UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"

conf/machine/beagle-x15.conf

@@ -1,13 +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"

conf/machine/beagleboard.conf

@@ -5,14 +5,16 @@
 require conf/machine/include/omap3.inc
 
 # Only has DVI connector for external screen
-MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
 
-IMAGE_FSTYPES += "tar.xz ubi"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-beagleboard"
+PREFERRED_PROVIDER_u-boot = "u-boot-beagleboard"
+
+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,19 +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"
 
-IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
+SERIAL_CONSOLE = "115200 ttyO0"
 
-# Refine the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_BOARDS = "bbbAM335x"
+UBOOT_MACHINE = "am335x_evm_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

@@ -2,27 +2,11 @@
 #@NAME: DRA7xx EVM
 #@DESCRIPTION: Machine configuration for the TI DRA7xx EVM
 
-require conf/machine/include/dra7xx.inc
+require conf/machine/include/omap-a15.inc
 
-MACHINE_FEATURES += "touchscreen"
+IMAGE_FSTYPES += "ubi tar.gz"
 
-SERIAL_CONSOLES = "115200;ttyS0"
-
-KERNEL_DEVICETREE = " \
-    dra7-evm.dtb \
-    ti/dra7x-evm-osd-lcd-common.dtbo \
-    dra71-evm.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'dra71-evm-nand.dtb', d)} \
-    ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \
-    dra72-evm.dtb \
-    dra72-evm-revc.dtb \
-    ti/dra72-evm-touchscreen.dtbo \
-    ti/dra74-evm-touchscreen.dtbo \
-    dra76-evm.dtb \
-    ti/dra76-evm-tfp410.dtbo \
-    ti/lcd-osd101t2045.dtbo \
-    ti/lcd-osd101t2587.dtbo \
-"
+SERIAL_CONSOLE = "115200 ttyO0"
 
 UBOOT_MACHINE = "dra7xx_evm_config"
 
@@ -37,7 +21,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 3836"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -47,6 +31,6 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 8192"
 # 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"
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"

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-dra7xx"
-OPTEEFLAVOR = "dra7xx"
-OPTEEOUTPUTMACHINE = "ti"
-OPTEEPAGER = "y"

conf/machine/include/am62axx.inc

@@ -1,16 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am62axx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am62x"
-OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am62xx-lp.inc

@@ -1,18 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am62xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-# Default tiboot3.bin on AM62x LP is for HS-SE
-BBMULTICONFIG += "k3r5-hs-se"
-do_image_wic[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-hs-se:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am62x"
-OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am62xx.inc

@@ -1,16 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am62xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am62x"
-OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am64xx.inc

@@ -1,41 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am64xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am642-evm.dtb \
-    ti/k3-am642-sk.dtb \
-    ti/k3-am642-evm-icssg1-dualemac.dtbo \
-    ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
-    ti/k3-am642-evm-nand.dtbo \
-"
-
-# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
-BBMULTICONFIG = "k3r5-sr2-hs-fs"
-do_image_wic[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5-sr2-hs-fs:ti-sci-fw:do_deploy"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
-BBMULTICONFIG += "k3r5-gp"
-IMAGE_BOOT_FILES += " tiboot3-am64x-gp-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-gp:ti-sci-fw:do_deploy"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
-BBMULTICONFIG += "k3r5-sr2-hs-se"
-IMAGE_BOOT_FILES += " tiboot3-am64x_sr2-hs-evm.bin"
-do_image_wic[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2-hs-se:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am64x"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am64x"
-TI_PDK_LIMIT_BOARDS = "am64x_evm"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0 mcu1_1 mcu2_0 mcu2_1"

conf/machine/include/am65xx.inc

@@ -1,40 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":am65xx"
-
-MACHINE_FEATURES += "screen touchscreen gpu"
-
-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.dtbo \
-    ti/k3-am654-gp.dtbo \
-    ti/k3-am654-idk.dtbo \
-    ti/k3-am654-idk-sr1.dtbo \
-    ti/k3-am654-sr1.dtbo \
-    ti/k3-am654-pcie-usb2.dtbo \
-    ti/k3-am654-pcie-usb3.dtbo \
-    ti/k3-am654-evm-tc358876.dtbo \
-    ti/k3-am654-evm-oldi-lcd1evm.dtbo \
-    ti/k3-am654-evm-ov5640.dtbo \
-"
-
-BBMULTICONFIG += "k3r5-sr2"
-
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
-# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
-
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
-OPTEEMACHINE = "k3-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"
-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-davinci"
+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/dra7xx.inc

@@ -1,4 +0,0 @@
-require conf/machine/include/omap-a15.inc
-SOC_FAMILY_append = ":dra7xx"
-
-MACHINE_FEATURES += "pci"

conf/machine/include/j7.inc

@@ -1,10 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY_append = ":j7"
-
-OPTEEMACHINE = "k3-j721e"
-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"

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,52 +0,0 @@
-# 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/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-KERNEL_IMAGETYPE = "Image"
-KERNEL_IMAGETYPES = "Image fitImage"
-KERNEL_CLASSES += "kernel-fitimage"
-
-UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-SPL_BINARY = "tispl.bin"
-SPL_BINARYNAME = "tispl.bin"
-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
-# 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 alsa ethernet pci"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-
-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-
-WKS_FILE ?= "sdimage-2part.wks"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"

conf/machine/include/k3r5.inc

@@ -1,26 +0,0 @@
-# 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 = "u-boot-spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-
-PACKAGECONFIG_pn-u-boot-ti-staging = ""
-PACKAGECONFIG_pn-u-boot-ti-mainline = ""
-
-TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"

conf/machine/include/keystone.inc

@@ -1,30 +1,21 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":keystone"
+SOC_FAMILY = "keystone"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa15.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/kernel = "linux-keystone"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-keystone"
+PREFERRED_PROVIDER_u-boot = "u-boot-keystone"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r10"
+MACHINE_KERNEL_PR = "r7"
 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE = "uImage"
 
 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"
-
 EXTRA_IMAGEDEPENDS += "u-boot"
 EXTRA_IMAGEDEPENDS += "boot-monitor"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp"
-MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci"

conf/machine/include/omap-a15.inc

@@ -1,38 +1,21 @@
-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"
 require conf/machine/include/tune-cortexa15.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r7"
+MACHINE_KERNEL_PR = "r3"
 
-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"
 
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPES = "zImage uImage"
-KERNEL_CLASSES += "kernel-uimage"
 
 UBOOT_ARCH = "arm"
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}"
-
-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${DEVICETREE_FILE} \
-"
-
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -40,16 +23,8 @@ 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 gc320"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"

conf/machine/include/omap3.inc

@@ -1,7 +1,6 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap3"
+SOC_FAMILY = "omap3"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -10,23 +9,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 = "r125"
 
-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-omap"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"
@@ -39,4 +35,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,22 +1,21 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":omap4"
+SOC_FAMILY = "omap4"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-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/kernel = "linux-omap4"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 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 = "r1"
 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_MACHINE = "omap4_panda_config"
 

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,5 +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"
-KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
-require conf/machine/include/soc-family.inc

conf/machine/include/ti33x.inc

@@ -1,7 +1,6 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":ti33x"
+SOC_FAMILY = "ti33x"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa8.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -14,61 +13,29 @@ 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"
+MACHINE_KERNEL_PR = "r21"
 
 # 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"
 
 KERNEL_IMAGETYPE = "zImage"
 
-KERNEL_DEVICETREE = " \
-    am335x-evm.dtb am335x-evmsk.dtb \
-    am335x-icev2.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-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"
 
-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
-"
-
-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"
 
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+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"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

conf/machine/include/ti43x.inc

@@ -1,7 +1,6 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY_append = ":ti43x"
+SOC_FAMILY = "ti43x"
+require conf/machine/include/soc-family.inc
 
-DEFAULTTUNE ?= "armv7athf-neon"
 require conf/machine/include/tune-cortexa9.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
@@ -14,46 +13,24 @@ 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"
+MACHINE_KERNEL_PR = "r2"
 
 # 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"
 
 KERNEL_IMAGETYPE = "zImage"
 
-KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \
-    am437x-sk-evm.dtb am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb \
-    ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \
-"
-
-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
-
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am43xx_evm_config"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
-# Generate an extlinux.conf file
-UBOOT_EXTLINUX = "1"
-UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
-UBOOT_EXTLINUX_BOOT_FILES = " \
-    extlinux.conf;extlinux/extlinux.conf \
-    ${KERNEL_IMAGETYPE} \
-    ${KERNEL_DEVICETREE} \
-"
-
-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"
@@ -61,13 +38,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"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}"
-do_image_wic[depends] += "u-boot:do_deploy"
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet sgx"

conf/machine/j7-evm-k3r5.conf

@@ -1,17 +0,0 @@
-#@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"
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "j721e_evm_r5_defconfig"

conf/machine/j7-evm.conf

@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 EVM
-#@DESCRIPTION: Machine configuration for the TI J7 EVM
-
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
-IMAGE_BOOT_FILES += "sysfw.itb"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721e-common-proc-board.dtb \
-    ti/k3-j721e-proc-board-tps65917.dtb \
-    ti/k3-j721e-common-proc-board-infotainment.dtbo \
-    ti/k3-j721e-sk.dtb \
-"
-
-UBOOT_MACHINE = "j721e_evm_a72_config"

conf/machine/j7-hs-evm-k3r5-sr1-1.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7 SR1.1 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7 SR1.1 HS EVM (R5F core)
-
-# Booting SR1.1 requires different SYSFW, the rest is handled at runtime
-
-require conf/machine/j7-hs-evm-k3r5.conf
-SOC_FAMILY_append = ":k3r5-sr1-1"
-
-SYSFW_SOC = "j721e_sr1_1"
-SYSFW_SYMLINK = "sysfw.itb"

conf/machine/j7-hs-evm-k3r5.conf

@@ -1,18 +0,0 @@
-#@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"
-SYSFW_SYMLINK = ""
-
-SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}"
-SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"

conf/machine/j7-hs-evm.conf

@@ -1,27 +0,0 @@
-#@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"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"
-SYSFW_SYMLINK = ""
-
-BBMULTICONFIG += "k3r5-sr1-1"
-
-# Since default sysfw.itb on J7 is for SR1.1, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"

conf/machine/j7200-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7200 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j7200"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j7200_evm_r5_defconfig"

conf/machine/j7200-evm.conf

@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 EVM
-#@DESCRIPTION: Machine configuration for the TI J7200 EVM
-
-require conf/machine/include/j7.inc
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j7200-common-proc-board.dtb \
-"
-
-UBOOT_MACHINE = "j7200_evm_a72_config"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"

conf/machine/j7200-hs-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j7200_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j7200_hs_evm_r5_defconfig"

conf/machine/j7200-hs-evm.conf

@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J7200 HS EVM
-
-require conf/machine/j7200-evm.conf
-
-UBOOT_MACHINE = "j7200_hs_evm_a72_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"

conf/machine/j721s2-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721S2 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j721s2_evm_r5_defconfig"

conf/machine/j721s2-evm.conf

@@ -1,27 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 EVM
-#@DESCRIPTION: Machine configuration for the TI J721S2 EVM
-
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am68-sk-base-board.dtb \
-    ti/k3-am68-sk-bb-csi2-ov5640.dtb \
-    ti/k3-am68-sk-bb-rpi-cam-imx219.dtbo \
-    ti/k3-am68-sk-som-ddr_mem_carveout.dtbo \
-    ti/k3-j721s2-common-proc-board.dtb \
-    ti/k3-j721s2-gesi-exp-board.dtbo \
-"
-
-UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"

conf/machine/j721s2-hs-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j721s2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig"

conf/machine/j721s2-hs-evm.conf

@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
-
-require conf/machine/j721s2-evm.conf
-
-UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
-
-UBOOT_ENTRYPOINT =       "0x80080000"
-UBOOT_LOADADDRESS =      "0x80080000"
-UBOOT_RD_LOADADDRESS =   "0x84000000"
-UBOOT_RD_ENTRYPOINT =    "0x84000000"
-UBOOT_DTB_LOADADDRESS =  "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET =      "0x00010000"
-
-SPL_BINARY = "tispl.bin_HS"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"

conf/machine/j784s4-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J784S4 EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "j784s4_evm_r5_defconfig"

conf/machine/j784s4-evm.conf

@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 EVM
-#@DESCRIPTION: Machine configuration for the TI J784S4 EVM
-
-require conf/machine/include/j7.inc
-
-MACHINE_FEATURES += "gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-TFA_K3_USART = "0x8"
-OPTEEMACHINE = "k3-j784s4"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j784s4-evm.dtb \
-"
-
-UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "j784s4"
-

conf/machine/j784s4-hs-evm-k3r5.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 HS EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "j784s4"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "j784s4_evm_r5_defconfig"

conf/machine/j784s4-hs-evm.conf

@@ -1,11 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM
-
-require conf/machine/j784s4-evm.conf
-
-UBOOT_MACHINE = "j784s4_evm_a72_defconfig"
-
-SPL_BINARY = "tispl.bin_HS"
-UBOOT_BINARY = "u-boot.img_HS"
-UBOOT_SYMLINK = "u-boot.img"

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

@@ -1,35 +0,0 @@
-#@TYPE: Machine
-#@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-ice.dtb \
-                     ${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'keystone-k2g-ice-pru-excl-uio.dtb', '', d)}"
-
-UBOOT_MACHINE = "k2g_evm_config"
-
-BOOT_MONITOR_MAKE_TARGET = "k2g"
-
-IMAGE_FSTYPES += "ubifs ubi tar.xz"
-
-SERIAL_CONSOLES = "115200;ttyS0"
-
-SYSVINIT_ENABLED_GETTYS = ""
-
-# do ubiattach /dev/ubi_ctrl -m 4
-# From dmesg:
-# UBI: smallest flash I/O unit:    4096
-# UBI: logical eraseblock size:    253952 bytes
-# from ubiattach stdout:
-# UBI device number 0, total 1926 LEBs
-MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 1926"
-
-# do ubiattach /dev/ubi_ctrl -m 4
-# from dmesg:
-# UBI: smallest flash I/O unit:    4096
-# UBI: physical eraseblock size:   256 KiB
-# UBI: sub-page size:              4096
-UBINIZE_ARGS = "-m 4096 -p 256KiB -s 4096 -O 4096"

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,15 +4,19 @@
 
 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.xz"
+IMAGE_FSTYPES += "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-SERIAL_CONSOLES = "115200;ttyS0"
+SERIAL_CONSOLE = "115200 ttyS0"
 USE_VT = "0"
 
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
+
 EXTRA_IMAGEDEPENDS += "x-load"
 
 # NOTE: there are NAND and OneNAND versions of this board...

conf/machine/omap5-evm.conf

@@ -4,11 +4,9 @@
 
 require conf/machine/include/omap-a15.inc
 
-IMAGE_FSTYPES += "ubi tar.xz"
+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 3836"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -32,3 +30,7 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 4300"
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
 
 UBOOT_MACHINE = "omap5_uevm_config"
+
+# Currently removing the sgx machine feature because there is no SGX package
+# available for omap5
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"

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.xz"
+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"

conf/multiconfig/k3r5-gp.conf

@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-gp"

conf/multiconfig/k3r5-hs-se.conf

@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-hs-se"

conf/multiconfig/k3r5-sr1-1.conf

@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-sr1-1"

conf/multiconfig/k3r5-sr2-hs-fs.conf

@@ -1,3 +0,0 @@
-require k3r5-sr2.conf
-
-MACHINE_append = "-hs-fs"

conf/multiconfig/k3r5-sr2-hs-se.conf

@@ -1,3 +0,0 @@
-require k3r5-sr2.conf
-
-MACHINE_append = "-hs-se"

conf/multiconfig/k3r5-sr2.conf

@@ -1,3 +0,0 @@
-require k3r5.conf
-
-MACHINE_append = "-sr2"