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

@@ -1,4 +1,23 @@
-Collection of layers for the OE-core universe
+The official OpenEmbedded/Yocto BSP layer for Texas Instruments platforms.
 
-Please see the respective READMEs in the layer subdirectories
+It is hosted on http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/ with the
+source repository at git://git.yoctoproject.org/meta-ti
 
+
+This layer depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+layers: meta
+branch: master
+
+
+The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
+distributions and layer stacks, such as:
+distro-less (only with OE-Core), with Yocto/Poky, with Angstrom or Arago.
+
+Please follow the recommended setup procedures of your OE distribution.
+
+
+Send pull requests, patches, comments or questions to meta-ti@yoctoproject.org
+
+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
+}

conf/layer.conf

@@ -0,0 +1,9 @@
+# We have a conf and classes directory, append to BBPATH
+BBPATH =. "${LAYERDIR}:"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "meta-ti"
+BBFILE_PATTERN_meta-ti := "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-ti = "6"

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,12 +4,14 @@
 
 require conf/machine/include/ti33x.inc
 
-MACHINE_FEATURES += "screen touchscreen"
+# 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_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 115200;ttyS3"
 # UBI: logical eraseblock size:    126976 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 1988 LEBs
-MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 12000"
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -30,4 +32,4 @@ MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 12000"
 # 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/am3517-evm.conf

@@ -0,0 +1,40 @@
+#@TYPE: Machine
+#@NAME: AM3517 EVM
+#@DESCRIPTION: Machine configuration for the TI Sitara AM3517 EVM
+
+require conf/machine/include/omap3.inc
+
+# 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_CONSOLE = "115200 ttyO2"
+USE_VT = "2"
+
+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"
+
+# NOTE: there are NAND and OneNAND versions of this board...
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"

conf/machine/am37x-evm.conf

@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: AM37x EVM
+#@DESCRIPTION: Machine configuration for the TI AM37x EVM
+
+require conf/machine/include/omap3.inc
+
+# 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_CONSOLE = "115200 ttyO0"
+
+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
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"

conf/machine/am437x-evm.conf

@@ -4,11 +4,14 @@
 
 require conf/machine/include/ti43x.inc
 
+# 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
@@ -21,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 6000"
+MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 994"
 
 # do ubiattach /dev/ubi_ctrl -m 11 -O 4096
 # from dmesg:

conf/machine/beagleboard.conf

@@ -0,0 +1,40 @@
+#@TYPE: Machine
+#@NAME: Beagleboard machine
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 
+
+require conf/machine/include/omap3.inc
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+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"
+
+SERIAL_CONSOLE = "115200 ttyO2"
+
+UBOOT_MACHINE = "omap3_beagle_config"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+# 
+# Beagleboard C5 has 3998 LEBS (490MiB)
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+# For a modularized kernel we want to drag in networking, sound, rtc etc."
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-smsc95xx kernel-module-snd-soc-twl4030 kernel-module-rtc-twl \
+  kernel-module-snd-soc-omap kernel-module-snd-soc-omap-mcbsp kernel-module-snd-soc-omap3beagle"

conf/machine/beaglebone.conf

@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: BeagleBone machine
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
+
+require conf/machine/include/ti33x.inc
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+IMAGE_FSTYPES += "tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO0"
+
+UBOOT_MACHINE = "am335x_evm_config"

conf/machine/dra7xx-evm.conf

@@ -2,26 +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_PREFIX = " \
-    dra7 \
-    ti/dra7 \
-    ti/lcd \
-    ti/omap/dra7 \
-"
-
-KERNEL_DEVICETREE = " \
-    dra7-evm.dtb \
-    dra71-evm.dtb \
-    dra72-evm.dtb \
-    dra72-evm-revc.dtb \
-    dra76-evm.dtb \
-"
+SERIAL_CONSOLE = "115200 ttyO0"
 
 UBOOT_MACHINE = "dra7xx_evm_config"
 
@@ -36,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:
@@ -45,3 +30,7 @@ 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"
+
+# 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/include/davinci.inc

@@ -0,0 +1,21 @@
+require conf/machine/include/tune-arm926ejs.inc
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r53"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+
+UBOOT_MACHINE = "davinci_dvevm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+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/keystone.inc

@@ -0,0 +1,21 @@
+SOC_FAMILY = "keystone"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa15.inc
+
+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 = "r7"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "boot-monitor"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci"

conf/machine/include/omap-a15.inc

@@ -0,0 +1,30 @@
+SOC_FAMILY = "omap-a15"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa15.inc
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r3"
+
+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"
+
+UBOOT_ARCH = "arm"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-video-fbdev"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+UBI_VOLNAME = "rootfs"

conf/machine/include/omap3.inc

@@ -0,0 +1,38 @@
+SOC_FAMILY = "omap3"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa8.inc
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+# For built-in LCD, add xf86-input-tslib
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+# Default to external video, change to smallscreen for built-in LCD
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r125"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# Default providers, may need to override for specific machines
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "omap3_evm_config"
+XLOAD_MACHINE = "omap3evm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# If SPL is not used, may need to add x-load
+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 sgx"

conf/machine/include/omap4.inc

@@ -0,0 +1,25 @@
+SOC_FAMILY = "omap4"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa9.inc
+
+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-omap"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r1"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_MACHINE = "omap4_panda_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot"

conf/machine/include/omapl138.inc

@@ -0,0 +1,2 @@
+SOC_FAMILY = "omapl138"
+require conf/machine/include/soc-family.inc

conf/machine/include/ti33x.inc

@@ -0,0 +1,41 @@
+SOC_FAMILY = "ti33x"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa8.inc
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+# For built-in LCD, add xf86-input-tslib
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+# Default to external video, change to smallscreen for built-in LCD
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r21"
+
+# 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_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "am335x_evm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+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 sgx"

conf/machine/include/ti43x.inc

@@ -0,0 +1,41 @@
+SOC_FAMILY = "ti43x"
+require conf/machine/include/soc-family.inc
+
+require conf/machine/include/tune-cortexa9.inc
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+# For built-in LCD, add xf86-input-tslib
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+# Default to external video, change to smallscreen for built-in LCD
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r2"
+
+# 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_IMAGETYPE = "zImage"
+
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "am43xx_evm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# Use the expected value of the ubifs filesystem's volume name in the kernel
+# and u-boot.
+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 sgx"

conf/machine/k2e-evm.conf

@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2E machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2E EVM
+
+require conf/machine/include/keystone.inc
+
+UBOOT_MACHINE = "k2e_evm_config"
+
+BOOT_MONITOR_MAKE_TARGET = "k2e"
+
+IMAGE_FSTYPES += "ubi tar.gz cpio"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+SYSVINIT_ENABLED_GETTYS = ""
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 3856 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              2048
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"

conf/machine/k2hk-evm.conf

@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2HK machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2HK EVM
+
+require conf/machine/include/keystone.inc
+
+UBOOT_MACHINE = "k2hk_evm_config"
+
+BOOT_MONITOR_MAKE_TARGET = "k2hk"
+
+IMAGE_FSTYPES += "ubi tar.gz cpio"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+SYSVINIT_ENABLED_GETTYS = ""
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 3856 LEBs
+MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              2048
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"

conf/machine/k2l-evm.conf

@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: Keystone 2 K2L machine
+#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2L EVM
+
+require conf/machine/include/keystone.inc
+
+UBOOT_MACHINE = "k2l_evm_config"
+
+BOOT_MONITOR_MAKE_TARGET = "k2l"
+
+IMAGE_FSTYPES += "ubi tar.gz cpio"
+
+SERIAL_CONSOLE = "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/omap3evm.conf

@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: OMAP3 EVM
+#@DESCRIPTION: Machine configuration for the TI OMAP3 EVM
+
+require conf/machine/include/omap3.inc
+
+# 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_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...
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"

conf/machine/omap5-evm.conf

@@ -1,39 +1,12 @@
 #@TYPE: Machine
-#@NAME: AM57xx EVM
-#@DESCRIPTION: Machine configuration for the TI AM57xx EVM
+#@NAME: OMAP5 EVM
+#@DESCRIPTION: Machine configuration for the TI OMAP5 uEVM
 
-require conf/machine/include/am57xx.inc
+require conf/machine/include/omap-a15.inc
 
-MACHINE_FEATURES += "touchscreen"
+IMAGE_FSTYPES += "ubi tar.gz"
 
-SERIAL_CONSOLES = "115200;ttyS2"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    am57 \
-    ti/am57 \
-    ti/lcd \
-    ti/ov10635 \
-    ti/omap/am57 \
-"
-
-KERNEL_DEVICETREE_DTBMERGE = " \
-    am57xx-evm.dtb \
-    am57xx-evm-reva3.dtb \
-    ti/omap/am57xx-evm.dtb \
-    ti/omap/am57xx-evm-reva3.dtb \
-"
-
-KERNEL_DEVICETREE = " \
-    am57xx-beagle-x15.dtb \
-    am57xx-beagle-x15-revb1.dtb \
-    am57xx-beagle-x15-revc.dtb \
-    am5729-beagleboneai.dtb \
-    am571x-idk.dtb \
-    am572x-idk.dtb \
-    am574x-idk.dtb \
-"
-
-UBOOT_MACHINE = "am57xx_evm_config"
+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
@@ -46,7 +19,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 3836"
 
 # do ubiattach /dev/ubi_ctrl -m 7 -O 2048
 # from dmesg:
@@ -55,3 +28,9 @@ 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"
+
+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/pandaboard.conf

@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Pandaboard
+#@DESCRIPTION: Machine configuration for the OMAP4430 Panda
+
+require conf/machine/include/omap4.inc
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+IMAGE_FSTYPES += "tar.gz"
+
+SERIAL_CONSOLE = "115200 ttyO2"
+
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_FEATURES = "kernel26 wifi bluetooth alsa apm ext2 screen usbgadget usbhost vfat sgx"

meta-ti-bsp/COPYING.MIT

@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.

meta-ti-bsp/README

@@ -1,33 +0,0 @@
-The official OpenEmbedded/Yocto BSP layer for Texas Instruments platforms.
-
-It is hosted on http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/ with the
-source repository at git://git.yoctoproject.org/meta-ti
-
-
-This layer depends on:
-
-URI: git://git.openembedded.org/openembedded-core
-layers: meta
-branch: master
-
-URI: git://git.yoctoproject.org/meta-arm
-layers: meta-arm
-branch: master
-
-
-The base BSP part of meta-ti should work with different OpenEmbedded/Yocto
-distributions and layer stacks, such as:
-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
-
-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>

meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass

@@ -1,758 +0,0 @@
-inherit ti-secdev kernel-uboot uboot-sign-legacyhs
-
-FITIMAGE_HASH_ALGO ?= "sha1"
-FITIMAGE_PACK_TEE ?= "0"
-FITIMAGE_DTB_BY_NAME ?= "0"
-FITIMAGE_TEE_BY_NAME ?= "0"
-FITIMAGE_CONF_BY_NAME ?= "0"
-
-python __anonymous () {
-    kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
-    if 'fitImage' in kerneltypes.split():
-        depends = d.getVar("DEPENDS")
-        depends = "%s u-boot-mkimage-native dtc-native" % depends
-        d.setVar("DEPENDS", depends)
-
-        uarch = d.getVar("UBOOT_ARCH")
-        if uarch == "arm64":
-            replacementtype = "Image"
-        elif uarch == "mips":
-            replacementtype = "vmlinuz.bin"
-        elif uarch == "x86":
-            replacementtype = "bzImage"
-        elif uarch == "microblaze":
-            replacementtype = "linux.bin"
-        else:
-            replacementtype = "zImage"
-
-        # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
-        # to kernel.bbclass . We have to override it, since we pack zImage
-        # (at least for now) into the fitImage .
-        typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or ""
-        if 'fitImage' in typeformake.split():
-            d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', replacementtype))
-
-        image = d.getVar('INITRAMFS_IMAGE')
-        if image:
-            d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
-
-        # Verified boot will sign the fitImage and append the public key to
-        # U-boot dtb. We ensure the U-Boot dtb is deployed before assembling
-        # the fitImage:
-        if d.getVar('UBOOT_SIGN_ENABLE'):
-            uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
-            d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' % uboot_pn)
-
-        if d.getVar('FITIMAGE_PACK_TEE') == "1":
-            d.appendVarFlag('do_assemble_fitimage', 'depends', ' optee-os:do_deploy')
-}
-
-# Options for the device tree compiler passed to mkimage '-D' feature:
-UBOOT_MKIMAGE_DTCOPTS ??= ""
-
-fitimage_ti_secure() {
-	if test -f "${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh"; then
-		export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh $1 $2
-	else
-		cp $1 $2
-	fi
-}
-
-#
-# Emit the fitImage ITS header
-#
-# $1 ... .its filename
-fitimage_emit_fit_header() {
-	cat << EOF >> ${1}
-/dts-v1/;
-
-/ {
-        description = "U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}";
-        #address-cells = <1>;
-EOF
-}
-
-#
-# Emit the fitImage section bits
-#
-# $1 ... .its filename
-# $2 ... Section bit type: imagestart - image section start
-#                          confstart  - configuration section start
-#                          sectend    - section end
-#                          fitend     - fitimage end
-#
-fitimage_emit_section_maint() {
-	case $2 in
-	imagestart)
-		cat << EOF >> ${1}
-
-        images {
-EOF
-	;;
-	confstart)
-		cat << EOF >> ${1}
-
-        configurations {
-EOF
-	;;
-	sectend)
-		cat << EOF >> ${1}
-        };
-EOF
-	;;
-	fitend)
-		cat << EOF >> ${1}
-};
-EOF
-	;;
-	esac
-}
-
-#
-# Emit the fitImage ITS kernel section
-#
-# $1 ... .its filename
-# $2 ... Image counter
-# $3 ... Path to kernel image
-# $4 ... Compression type
-fitimage_emit_section_kernel() {
-
-	kernel_csum=${FITIMAGE_HASH_ALGO}
-
-	ENTRYPOINT="${UBOOT_ENTRYPOINT}"
-	if test -n "${UBOOT_ENTRYSYMBOL}"; then
-		ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
-			awk '$4=="${UBOOT_ENTRYSYMBOL}" {print $2}'`
-	fi
-
-	cat << EOF >> ${1}
-                kernel-${2} {
-                        description = "Linux kernel";
-                        data = /incbin/("${3}");
-                        type = "kernel";
-                        arch = "${UBOOT_ARCH}";
-                        os = "linux";
-                        compression = "${4}";
-                        load = <${UBOOT_LOADADDRESS}>;
-                        entry = <${ENTRYPOINT}>;
-EOF
-	if test -n "${FITIMAGE_HASH_ALGO}"; then
-		cat << EOF >> ${1}
-                        hash-1 {
-                                algo = "${kernel_csum}";
-                        };
-EOF
-	fi
-	cat << EOF >> ${1}
-                };
-EOF
-}
-
-#
-# Emit the fitImage ITS DTB section
-#
-# $1 ... .its filename
-# $2 ... Image counter/name
-# $3 ... Path to DTB image
-# $4 ... Load address
-fitimage_emit_section_dtb() {
-
-	dtb_csum=${FITIMAGE_HASH_ALGO}
-	dtb_loadline="${4}"
-
-	cat << EOF >> ${1}
-                ${2} {
-                        description = "Flattened Device Tree blob";
-                        data = /incbin/("${3}");
-                        type = "flat_dt";
-                        arch = "${UBOOT_ARCH}";
-                        compression = "none";
-                        ${dtb_loadline}
-EOF
-	if test -n "${FITIMAGE_HASH_ALGO}"; then
-		cat << EOF >> ${1}
-                        hash-1 {
-                                algo = "${dtb_csum}";
-                        };
-EOF
-	fi
-	cat << EOF >> ${1}
-                };
-EOF
-}
-
-#
-# Emit the fitImage ITS TEE section
-#
-# $1 ... .its filename
-# $2 ... Image counter/name
-# $3 ... Path to TEE image
-fitimage_emit_section_tee() {
-
-	tee_csum=${FITIMAGE_HASH_ALGO}
-
-	cat << EOF >> ${1}
-                ${2} {
-                        description = "OPTEE OS Image";
-                        data = /incbin/("${3}");
-                        type = "tee";
-                        arch = "${UBOOT_ARCH}";
-                        compression = "none";
-EOF
-	if test -n "${FITIMAGE_HASH_ALGO}"; then
-		cat << EOF >> ${1}
-                        hash-1 {
-                                algo = "${tee_csum}";
-                        };
-EOF
-	fi
-	cat << EOF >> ${1}
-                };
-EOF
-}
-
-#
-# Emit the fitImage ITS setup section
-#
-# $1 ... .its filename
-# $2 ... Image counter
-# $3 ... Path to setup image
-fitimage_emit_section_setup() {
-
-	setup_csum=${FITIMAGE_HASH_ALGO}
-
-	cat << EOF >> ${1}
-                setup-${2} {
-                        description = "Linux setup.bin";
-                        data = /incbin/("${3}");
-                        type = "x86_setup";
-                        arch = "${UBOOT_ARCH}";
-                        os = "linux";
-                        compression = "none";
-                        load = <0x00090000>;
-                        entry = <0x00090000>;
-EOF
-	if test -n "${FITIMAGE_HASH_ALGO}"; then
-		cat << EOF >> ${1}
-                        hash-1 {
-                                algo = "${setup_csum}";
-                        };
-EOF
-	fi
-	cat << EOF >> ${1}
-                };
-EOF
-}
-
-#
-# Emit the fitImage ITS ramdisk section
-#
-# $1 ... .its filename
-# $2 ... Image counter
-# $3 ... Path to ramdisk image
-fitimage_emit_section_ramdisk() {
-
-	ramdisk_csum=${FITIMAGE_HASH_ALGO}
-	ramdisk_ctype="none"
-
-	case $3 in
-		*.gz|*.gz.sec)
-			ramdisk_ctype="gzip"
-			;;
-		*.bz2|*.bz2.sec)
-			ramdisk_ctype="bzip2"
-			;;
-		*.lzma|*.lzma.sec)
-			ramdisk_ctype="lzma"
-			;;
-		*.lzo|*.lzo.sec)
-			ramdisk_ctype="lzo"
-			;;
-		*.lz4|*.lz4.sec)
-			ramdisk_ctype="lz4"
-			;;
-	esac
-
-	cat << EOF >> ${1}
-                ramdisk-${2} {
-                        description = "ramdisk image";
-                        data = /incbin/("${3}");
-                        type = "ramdisk";
-                        arch = "${UBOOT_ARCH}";
-                        os = "linux";
-                        compression = "${ramdisk_ctype}";
-EOF
-	if test -n "${UBOOT_RD_LOADADDRESS}"; then
-		cat << EOF >> ${1}
-                        load = <${UBOOT_RD_LOADADDRESS}>;
-EOF
-	fi
-
-	if test -n "${UBOOT_RD_ENTRYPOINT}"; then
-		cat << EOF >> ${1}
-                        entry = <${UBOOT_RD_ENTRYPOINT}>;
-EOF
-	fi
-
-	if test -n "${FITIMAGE_HASH_ALGO}"; then
-		cat << EOF >> ${1}
-                        hash-1 {
-                                algo = "${ramdisk_csum}";
-                        };
-EOF
-	fi
-	cat << EOF >> ${1}
-                };
-EOF
-}
-
-#
-# Emit the fitImage ITS configuration section
-#
-# $1 ... .its filename
-# $2 ... Linux kernel ID
-# $3 ... DTB image ID/name
-# $4 ... ramdisk ID
-# $5 ... config ID
-# $6 ... tee ID/name
-fitimage_emit_section_config() {
-
-	conf_csum=${FITIMAGE_HASH_ALGO}
-	if [ -n "${UBOOT_SIGN_ENABLE}" ] ; then
-		conf_sign_keyname="${UBOOT_SIGN_KEYNAME}"
-	fi
-
-	sep=""
-	conf_desc=""
-	kernel_line=""
-	fdt_line=""
-	ramdisk_line=""
-	setup_line=""
-	default_line=""
-
-	if [ -n "${2}" ]; then
-		conf_desc="Linux kernel"
-		sep=", "
-		kernel_line="kernel = \"kernel-${2}\";"
-	fi
-
-	if [ -n "${3}" ]; then
-		conf_desc="${conf_desc}${sep}FDT blob"
-		sep=", "
-	fi
-
-	if [ -n "${4}" ]; then
-		conf_desc="${conf_desc}${sep}ramdisk"
-		sep=", "
-		ramdisk_line="ramdisk = \"ramdisk-${4}\";"
-	fi
-
-	if [ -n "${5}" ]; then
-		conf_desc="${conf_desc}${sep}setup"
-		sep=", "
-		setup_line="setup = \"setup-${5}\";"
-	fi
-
-	if [ -n "${6}" -a "x${FITIMAGE_PACK_TEE}" = "x1" ]; then
-		if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ]; then
-			loadables_line="loadables = \"${6}.optee\";"
-			loadables_pager_line="loadables = \"${6}-pager.optee\";"
-		else
-			loadables_line="loadables = \"tee-${6}\";"
-			nextnum=`expr ${6} + 1`
-			loadables_pager_line="loadables = \"tee-${nextnum}\";"
-		fi
-		final_conf_desc="${conf_desc}${sep}OPTEE OS Image"
-	else
-		loadables_line=""
-		loadables_pager_line=""
-		final_conf_desc="${conf_desc}"
-	fi
-
-	dtbcount=1
-	for DTB in ${KERNEL_DEVICETREE}; do
-		DTB=$(basename "${DTB}")
-		dtb_ext=${DTB##*.}
-		if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
-			conf_name="${DTB}"
-		else
-			conf_name="conf-${dtbcount}"
-		fi
-
-		if [ "x${FITIMAGE_DTB_BY_NAME}" = "x1" ] ; then
-			fdt_line="fdt = \"${DTB}\";"
-		else
-			fdt_line="fdt = \"fdt-${dtbcount}\";"
-		fi
-
-		if [ "x${dtbcount}" = "x1" ]; then
-			cat << EOF >> ${1}
-                default = "${conf_name}";
-EOF
-		fi
-
-# Generate a single configuration section
-			cat << EOF >> ${1}
-                ${conf_name} {
-                        description = "${final_conf_desc}";
-                        ${fdt_line}
-EOF
-			if [ "${dtb_ext}" != "dtbo" ]; then
-			cat << EOF >> ${1}
-                        ${kernel_line}
-                        ${ramdisk_line}
-                        ${setup_line}
-                        ${loadables_line}
-EOF
-			fi
-			if test -n "${FITIMAGE_HASH_ALGO}"; then
-				cat << EOF >> ${1}
-                        hash-1 {
-                                algo = "${conf_csum}";
-                        };
-EOF
-			fi
-
-			if [ ! -z "${conf_sign_keyname}" ] ; then
-
-				sign_line="sign-images = \"kernel\""
-
-				if [ -n "${3}" ]; then
-					sign_line="${sign_line}, \"fdt\""
-				fi
-
-				if [ -n "${4}" ]; then
-					sign_line="${sign_line}, \"ramdisk\""
-				fi
-
-				if [ -n "${5}" ]; then
-					sign_line="${sign_line}, \"setup\""
-				fi
-
-				sign_line="${sign_line};"
-
-				cat << EOF >> ${1}
-                        signature-1 {
-                                algo = "${conf_csum},rsa2048";
-                                key-name-hint = "${conf_sign_keyname}";
-                                ${sign_line}
-                        };
-EOF
-			fi
-
-			cat << EOF >> ${1}
-                };
-EOF
-# End single config section
-
-# Generate a single "pager" configuration section
-		if [ "${OPTEEPAGER}" = "y" ]; then
-			if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
-				conf_name="${DTB}-pager"
-			else
-				conf_name="conf-${dtbcount}"
-			fi
-
-			cat << EOF >> ${1}
-                ${conf_name} {
-                        description = "${final_conf_desc}";
-                        ${fdt_line}
-EOF
-			if [ "${dtb_ext}" != "dtbo" ]; then
-			cat << EOF >> ${1}
-                        ${kernel_line}
-                        ${ramdisk_line}
-                        ${setup_line}
-                        ${loadables_pager_line}
-EOF
-			fi
-			if test -n "${FITIMAGE_HASH_ALGO}"; then
-				cat << EOF >> ${1}
-                        hash-1 {
-                                algo = "${conf_csum}";
-                        };
-EOF
-			fi
-
-			if [ ! -z "${conf_sign_keyname}" ] ; then
-
-				sign_line="sign-images = \"kernel\""
-
-				if [ -n "${3}" ]; then
-					sign_line="${sign_line}, \"fdt\""
-				fi
-
-				if [ -n "${4}" ]; then
-					sign_line="${sign_line}, \"ramdisk\""
-				fi
-
-				if [ -n "${5}" ]; then
-					sign_line="${sign_line}, \"setup\""
-				fi
-
-				sign_line="${sign_line};"
-
-				cat << EOF >> ${1}
-                        signature-1 {
-                                algo = "${conf_csum},rsa2048";
-                                key-name-hint = "${conf_sign_keyname}";
-                                ${sign_line}
-                        };
-EOF
-			fi
-
-			cat << EOF >> ${1}
-                };
-EOF
-		fi
-# End single config section
-
-		dtbcount=`expr ${dtbcount} + 1`
-	done
-}
-
-#
-# Assemble fitImage
-#
-# $1 ... .its filename
-# $2 ... fitImage name
-# $3 ... include ramdisk
-fitimage_assemble() {
-	kernelcount=1
-	dtbcount=""
-	ramdiskcount=${3}
-	setupcount=""
-	teecount=1
-	rm -f ${1} arch/${ARCH}/boot/${2}
-
-	fitimage_emit_fit_header ${1}
-
-	#
-	# Step 1: Prepare a kernel image section.
-	#
-	fitimage_emit_section_maint ${1} imagestart
-
-	uboot_prep_kimage
-	fitimage_ti_secure linux.bin linux.bin.sec
-	fitimage_emit_section_kernel ${1} "${kernelcount}" linux.bin.sec "${linux_comp}"
-
-	#
-	# Step 2: Prepare a DTB image section
-	#
-	if test -n "${KERNEL_DEVICETREE}"; then
-		dtbcount=1
-		dtboaddress="${UBOOT_DTBO_LOADADDRESS}"
-		for DTB in ${KERNEL_DEVICETREE}; do
-			if echo ${DTB} | grep -q '/dts/'; then
-				bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
-				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
-			fi
-			DTB_PATH="arch/${ARCH}/boot/dts/${DTB}"
-			if [ ! -e "${DTB_PATH}" ]; then
-				DTB_PATH="arch/${ARCH}/boot/${DTB}"
-			fi
-			DTB=$(basename "${DTB}")
-
-			dtb_ext=${DTB##*.}
-			if [ "${dtb_ext}" = "dtbo" ]; then
-				if [ -n "${UBOOT_DTBO_LOADADDRESS}" ]; then
-					dtb_loadline="load = <${dtboaddress}>;"
-					num1=`printf "%d\n" ${dtboaddress}`
-					num2=`printf "%d\n" ${UBOOT_DTBO_OFFSET}`
-					num3=`expr $num1 + $num2`
-					dtboaddress=`printf "0x%x\n" $num3`
-				fi
-			elif [ -n "${UBOOT_DTB_LOADADDRESS}" ]; then
-				dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;"
-			fi
-
-			fitimage_ti_secure ${DTB_PATH} ${DTB_PATH}.sec
-			if [ "x${FITIMAGE_DTB_BY_NAME}" = "x1" ] ; then
-				fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}.sec "${dtb_loadline}"
-			else
-				fitimage_emit_section_dtb ${1} "fdt-${dtbcount}" ${DTB_PATH}.sec "${dtb_loadline}"
-			fi
-			if [ "x${dtbcount}" = "x1" ]; then
-				dtbref=${DTB}
-			fi
-			dtbcount=`expr ${dtbcount} + 1`
-		done
-	fi
-
-	#
-	# Step 2a: Prepare OP/TEE image section
-	#
-	if [ "x${FITIMAGE_PACK_TEE}" = "x1" ] ; then
-		mkdir -p ${B}/usr
-		rm -f ${B}/usr/${OPTEEFLAVOR}.optee
-		if [ -e "${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}.optee" ]; then
-			cp ${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}.optee ${B}/usr/.
-		fi
-		TEE_PATH="usr/${OPTEEFLAVOR}.optee"
-		fitimage_ti_secure ${TEE_PATH} ${TEE_PATH}.sec
-		if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ] ; then
-			fitimage_emit_section_tee ${1} ${OPTEEFLAVOR}.optee ${TEE_PATH}.sec
-		else
-			fitimage_emit_section_tee ${1} "tee-${teecount}" ${TEE_PATH}.sec
-		fi
-
-		if [ "${OPTEEPAGER}" = "y" ]; then
-			teecount=`expr ${teecount} + 1`
-			rm -f ${B}/usr/${OPTEEFLAVOR}-pager.optee
-			if [ -e "${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}-pager.optee" ]; then
-				cp ${DEPLOY_DIR_IMAGE}/${OPTEEFLAVOR}-pager.optee ${B}/usr/.
-			fi
-			TEE_PATH="usr/${OPTEEFLAVOR}-pager.optee"
-			fitimage_ti_secure ${TEE_PATH} ${TEE_PATH}.sec
-			if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ] ; then
-				fitimage_emit_section_tee ${1} ${OPTEEFLAVOR}-pager.optee ${TEE_PATH}.sec
-			else
-				fitimage_emit_section_tee ${1} "tee-${teecount}" ${TEE_PATH}.sec
-			fi
-		fi
-	fi
-
-	#
-	# Step 3: Prepare a setup section. (For x86)
-	#
-	if test -e arch/${ARCH}/boot/setup.bin ; then
-		setupcount=1
-		fitimage_emit_section_setup ${1} "${setupcount}" arch/${ARCH}/boot/setup.bin
-	fi
-
-	#
-	# Step 4: Prepare a ramdisk section.
-	#
-	if [ "x${ramdiskcount}" = "x1" ] ; then
-		# Find and use the first initramfs image archive type we find
-		for img in cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.gz cpio; do
-			initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${img}"
-			initramfs_local="usr/${INITRAMFS_IMAGE}-${MACHINE}.${img}"
-			echo "Using $initramfs_path"
-			if [ -e "${initramfs_path}" ]; then
-				fitimage_ti_secure ${initramfs_path} ${initramfs_local}.sec
-				fitimage_emit_section_ramdisk ${1} "${ramdiskcount}" ${initramfs_local}.sec
-				break
-			fi
-		done
-	fi
-
-	fitimage_emit_section_maint ${1} sectend
-
-	# Force the first Kernel and DTB in the default config
-	kernelcount=1
-	if test -n "${dtbcount}"; then
-		dtbcount=1
-	fi
-	teecount=1
-
-	#
-	# Step 5: Prepare a configurations section
-	#
-	fitimage_emit_section_maint ${1} confstart
-
-	if [ "x${FITIMAGE_DTB_BY_NAME}" != "x1" ] ; then
-		dtbref="fdt-${dtbcount}"
-	fi
-	if [ "x${FITIMAGE_TEE_BY_NAME}" = "x1" ] ; then
-		teeref="${OPTEEFLAVOR}"
-	else
-		teeref="${teecount}"
-	fi
-	fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}"
-
-	fitimage_emit_section_maint ${1} sectend
-
-	fitimage_emit_section_maint ${1} fitend
-
-	#
-	# Step 6: Assemble the image
-	#
-	uboot-mkimage \
-		${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-		-f ${1} \
-		arch/${ARCH}/boot/${2}
-
-	#
-	# Step 7: Sign the image and add public key to U-Boot dtb
-	#
-	if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
-		uboot-mkimage \
-			${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-			-F -k "${UBOOT_SIGN_KEYDIR}" \
-			-K "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}" \
-			-r arch/${ARCH}/boot/${2}
-	fi
-}
-
-do_assemble_fitimage() {
-	if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
-		cd ${B}
-		fitimage_assemble fit-image.its fitImage
-	fi
-}
-
-addtask assemble_fitimage before do_install after do_compile
-
-do_assemble_fitimage_initramfs() {
-	if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage" && \
-		test -n "${INITRAMFS_IMAGE}" ; then
-		cd ${B}
-		fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage-${INITRAMFS_IMAGE} 1
-	fi
-}
-
-addtask assemble_fitimage_initramfs before do_deploy after do_install
-
-FITIMAGE_ITS_SUFFIX ?= "its"
-FITIMAGE_ITB_SUFFIX ?= "itb"
-
-FITIMAGE_ITS_IMAGE ?= "fitImage-its-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITS_SUFFIX}"
-FITIMAGE_ITS_IMAGE[vardepsexclude] = "DATETIME"
-FITIMAGE_ITS_BINARY ?= "fitImage-its.${FITIMAGE_ITS_SUFFIX}"
-FITIMAGE_ITS_SYMLINK ?= "fitImage-its-${MACHINE}.${FITIMAGE_ITS_SUFFIX}"
-
-FITIMAGE_ITB_IMAGE ?= "fitImage-linux.bin-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITB_SUFFIX}"
-FITIMAGE_ITB_IMAGE[vardepsexclude] = "DATETIME"
-FITIMAGE_ITB_BINARY ?= "fitImage-linux.bin.${FITIMAGE_ITB_SUFFIX}"
-FITIMAGE_ITB_SYMLINK ?= "fitImage-linux.bin-${MACHINE}.${FITIMAGE_ITB_SUFFIX}"
-
-FITIMAGE_INITRAMFS_ITS_IMAGE ?= "fitImage-its-${INITRAMFS_IMAGE}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITS_SUFFIX}"
-FITIMAGE_INITRAMFS_ITS_IMAGE[vardepsexclude] = "DATETIME"
-FITIMAGE_INITRAMFS_ITS_BINARY ?= "fitImage-its-${INITRAMFS_IMAGE}.${FITIMAGE_ITS_SUFFIX}"
-FITIMAGE_INITRAMFS_ITS_SYMLINK ?= "fitImage-its-${INITRAMFS_IMAGE}-${MACHINE}.${FITIMAGE_ITS_SUFFIX}"
-
-FITIMAGE_INITRAMFS_ITB_IMAGE ?= "fitImage-${INITRAMFS_IMAGE}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.${FITIMAGE_ITB_SUFFIX}"
-FITIMAGE_INITRAMFS_ITB_IMAGE[vardepsexclude] = "DATETIME"
-FITIMAGE_INITRAMFS_ITB_BINARY ?= "fitImage-${INITRAMFS_IMAGE}.${FITIMAGE_ITB_SUFFIX}"
-FITIMAGE_INITRAMFS_ITB_SYMLINK ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}.${FITIMAGE_ITB_SUFFIX}"
-
-kernel_do_deploy:append() {
-	# Update deploy directory
-	if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
-		cd ${B}
-		echo "Copying fit-image.its source file..."
-		install -m 0644 fit-image.its ${DEPLOYDIR}/${FITIMAGE_ITS_IMAGE}
-		install -m 0644 arch/${ARCH}/boot/fitImage ${DEPLOYDIR}/${FITIMAGE_ITB_IMAGE}
-
-		if [ -n "${INITRAMFS_IMAGE}" ]; then
-			echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
-			install -m 0644 fit-image-${INITRAMFS_IMAGE}.its ${DEPLOYDIR}/${FITIMAGE_INITRAMFS_ITS_IMAGE}
-			install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} ${DEPLOYDIR}/${FITIMAGE_INITRAMFS_ITB_IMAGE}
-		fi
-
-		cd ${DEPLOYDIR}
-		ln -sf ${FITIMAGE_ITS_IMAGE} ${FITIMAGE_ITS_SYMLINK}
-		ln -sf ${FITIMAGE_ITS_IMAGE} ${FITIMAGE_ITS_BINARY}
-		ln -sf ${FITIMAGE_ITB_IMAGE} ${FITIMAGE_ITB_SYMLINK}
-		ln -sf ${FITIMAGE_ITB_IMAGE} ${FITIMAGE_ITB_BINARY}
-
-		if [ -n "${INITRAMFS_IMAGE}" ]; then
-			ln -sf ${FITIMAGE_INITRAMFS_ITS_IMAGE} ${FITIMAGE_INITRAMFS_ITS_SYMLINK}
-			ln -sf ${FITIMAGE_INITRAMFS_ITS_IMAGE} ${FITIMAGE_INITRAMFS_ITS_BINARY}
-			ln -sf ${FITIMAGE_INITRAMFS_ITB_IMAGE} ${FITIMAGE_INITRAMFS_ITB_SYMLINK}
-			ln -sf ${FITIMAGE_INITRAMFS_ITB_IMAGE} ${FITIMAGE_INITRAMFS_ITB_BINARY}
-		fi
-	fi
-}

meta-ti-bsp/classes/kernel-fitimage-ti-u-boot.bbclass

@@ -1,214 +0,0 @@
-
-inherit ti-secdev
-
-# The TI u-boot requires that the kernel image is signed.  To not overload the
-# entire kernel-fitimage.bbclass from oe-core, we just overwrite one function
-# and do the signing in there.
-
-#
-# Assemble fitImage
-#
-# $1 ... .its filename
-# $2 ... fitImage name
-# $3 ... include ramdisk
-fitimage_assemble() {
-	kernelcount=1
-	dtbcount=""
-	DTBS=""
-	ramdiskcount=$3
-	setupcount=""
-	bootscr_id=""
-	rm -f $1 arch/${ARCH}/boot/$2
-
-	if [ -n "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ]; then
-		bbfatal "Keys used to sign images and configuration nodes must be different."
-	fi
-
-	fitimage_emit_fit_header $1
-
-	#
-	# Step 1: Prepare a kernel image section.
-	#
-	fitimage_emit_section_maint $1 imagestart
-
-	uboot_prep_kimage
-	fitimage_ti_secure linux.bin linux.bin.sec
-	fitimage_emit_section_kernel $1 $kernelcount linux.bin.sec "$linux_comp"
-
-	#
-	# Step 2: Prepare a DTB image section
-	#
-
-	if [ -n "${KERNEL_DEVICETREE}" ]; then
-		dtbcount=1
-		for DTB in ${KERNEL_DEVICETREE}; do
-			if echo $DTB | grep -q '/dts/'; then
-				bbwarn "$DTB contains the full path to the the dts file, but only the dtb name should be used."
-				DTB=`basename $DTB | sed 's,\.dts$,.dtb,g'`
-			fi
-
-			# Skip ${DTB} if it's also provided in ${EXTERNAL_KERNEL_DEVICETREE}
-			if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ] && [ -s ${EXTERNAL_KERNEL_DEVICETREE}/${DTB} ]; then
-				continue
-			fi
-
-			DTB_PATH="arch/${ARCH}/boot/dts/$DTB"
-			if [ ! -e "$DTB_PATH" ]; then
-				DTB_PATH="arch/${ARCH}/boot/$DTB"
-			fi
-
-			DTB=$(echo "$DTB" | tr '/' '_')
-
-			# Skip DTB if we've picked it up previously
-			echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
-
-			fitimage_ti_secure ${DTB_PATH} ${DTB_PATH}.sec
-
-            DTBS="$DTBS $DTB"
-			fitimage_emit_section_dtb $1 $DTB ${DTB_PATH}.sec
-		done
-	fi
-
-	if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
-		dtbcount=1
-		for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \
-		$(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do
-			DTB=$(echo "$DTB" | tr '/' '_')
-
-			# Skip DTB/DTBO if we've picked it up previously
-			echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
-
-			fitimage_ti_secure ${EXTERNAL_KERNEL_DEVICETREE}/${DTB} ${EXTERNAL_KERNEL_DEVICETREE}/${DTB}.sec
-
-			DTBS="$DTBS $DTB"
-			fitimage_emit_section_dtb $1 $DTB "${EXTERNAL_KERNEL_DEVICETREE}/${DTB}.sec"
-		done
-	fi
-
-	#
-	# Step 3: Prepare a u-boot script section
-	#
-
-	if [ -n "${UBOOT_ENV}" ] && [ -d "${STAGING_DIR_HOST}/boot" ]; then
-		if [ -e "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY}" ]; then
-			cp ${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} ${B}
-			bootscr_id="${UBOOT_ENV_BINARY}"
-			fitimage_emit_section_boot_script $1 "$bootscr_id" ${UBOOT_ENV_BINARY}
-		else
-			bbwarn "${STAGING_DIR_HOST}/boot/${UBOOT_ENV_BINARY} not found."
-		fi
-	fi
-
-	#
-	# Step 4: Prepare a setup section. (For x86)
-	#
-	if [ -e arch/${ARCH}/boot/setup.bin ]; then
-		setupcount=1
-		fitimage_emit_section_setup $1 $setupcount arch/${ARCH}/boot/setup.bin
-	fi
-
-	#
-	# Step 5: Prepare a ramdisk section.
-	#
-	if [ "x${ramdiskcount}" = "x1" ] && [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
-		# Find and use the first initramfs image archive type we find
-		found=
-		for img in ${FIT_SUPPORTED_INITRAMFS_FSTYPES}; do
-			initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img"
-			initramfs_local="usr/${INITRAMFS_IMAGE_NAME}.$img"
-			if [ -e "$initramfs_path" ]; then
-				bbnote "Found initramfs image: $initramfs_path"
-				found=true
-				fitimage_ti_secure ${initramfs_path} ${initramfs_local}.sec
-
-				fitimage_emit_section_ramdisk $1 "$ramdiskcount" "${initramfs_local}.sec"
-				break
-			else
-				bbnote "Did not find initramfs image: $initramfs_path"
-			fi
-		done
-
-		if [ -z "$found" ]; then
-			bbfatal "Could not find a valid initramfs type for ${INITRAMFS_IMAGE_NAME}, the supported types are: ${FIT_SUPPORTED_INITRAMFS_FSTYPES}"
-		fi
-	fi
-
-	fitimage_emit_section_maint $1 sectend
-
-	# Force the first Kernel and DTB in the default config
-	kernelcount=1
-	if [ -n "$dtbcount" ]; then
-		dtbcount=1
-	fi
-
-	#
-	# Step 6: Prepare a configurations section
-	#
-	fitimage_emit_section_maint $1 confstart
-
-	# kernel-fitimage.bbclass currently only supports a single kernel (no less or
-	# more) to be added to the FIT image along with 0 or more device trees and
-	# 0 or 1 ramdisk.
-        # It is also possible to include an initramfs bundle (kernel and rootfs in one binary)
-        # When the initramfs bundle is used ramdisk is disabled.
-	# If a device tree is to be part of the FIT image, then select
-	# the default configuration to be used is based on the dtbcount. If there is
-	# no dtb present than select the default configuation to be based on
-	# the kernelcount.
-	if [ -n "$DTBS" ]; then
-		i=1
-		for DTB in ${DTBS}; do
-			dtb_ext=${DTB##*.}
-			if [ "$dtb_ext" = "dtbo" ]; then
-				fitimage_emit_section_config $1 "" "$DTB" "" "$bootscr_id" "" "`expr $i = $dtbcount`"
-			else
-				fitimage_emit_section_config $1 $kernelcount "$DTB" "$ramdiskcount" "$bootscr_id" "$setupcount" "`expr $i = $dtbcount`"
-			fi
-			i=`expr $i + 1`
-		done
-	else
-		defaultconfigcount=1
-		fitimage_emit_section_config $1 $kernelcount "" "$ramdiskcount" "$bootscr_id"  "$setupcount" $defaultconfigcount
-	fi
-
-	fitimage_emit_section_maint $1 sectend
-
-	fitimage_emit_section_maint $1 fitend
-
-	#
-	# Step 7: Assemble the image
-	#
-	${UBOOT_MKIMAGE} \
-		${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-		-f $1 \
-		arch/${ARCH}/boot/$2
-
-	#
-	# Step 8: Sign the image and add public key to U-Boot dtb
-	#
-	if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
-		add_key_to_u_boot=""
-		if [ -n "${UBOOT_DTB_BINARY}" ]; then
-			# The u-boot.dtb is a symlink to UBOOT_DTB_IMAGE, so we need copy
-			# both of them, and don't dereference the symlink.
-			cp -P ${STAGING_DATADIR}/u-boot*.dtb ${B}
-			add_key_to_u_boot="-K ${B}/${UBOOT_DTB_BINARY}"
-		fi
-		${UBOOT_MKIMAGE_SIGN} \
-			${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-			-F -k "${UBOOT_SIGN_KEYDIR}" \
-			$add_key_to_u_boot \
-			-r arch/${ARCH}/boot/$2 \
-			${UBOOT_MKIMAGE_SIGN_ARGS}
-	fi
-}
-
-fitimage_ti_secure() {
-	if test -n "${TI_SECURE_DEV_PKG}"; then
-		export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh $1 $2
-	else
-		cp $1 $2
-	fi
-}
-

meta-ti-bsp/classes/ti-secdev.bbclass

@@ -1,21 +0,0 @@
-# Helper class to prepare correct environment for signing with TI Security Development Tools
-
-# K3 SECDEV scripts use OpenSSL
-DEPENDS:append:k3 = " openssl-native"
-DEPENDS:append:k3r5 = " openssl-native"
-
-# Use package version of TI SECDEV for K3 if one is not provided through the environment
-DEPENDS:append:k3 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }"
-DEPENDS:append:k3r5 = "${@ '' if d.getVar('TI_SECURE_DEV_PKG_K3') else ' ti-k3-secdev-native' }"
-TI_K3_SECDEV_INSTALL_DIR = "${STAGING_DIR_NATIVE}${datadir}/ti/ti-k3-secdev"
-TI_SECURE_DEV_PKG:k3 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
-TI_SECURE_DEV_PKG:k3r5 = "${@ d.getVar('TI_SECURE_DEV_PKG_K3') or d.getVar('TI_K3_SECDEV_INSTALL_DIR') }"
-
-# For non-K3 we require the SECDEV tools be provided through the environment with the following vars
-TI_SECURE_DEV_PKG:ti33x = "${TI_SECURE_DEV_PKG_CAT}/am3x"
-TI_SECURE_DEV_PKG:ti43x = "${TI_SECURE_DEV_PKG_CAT}/am4x"
-TI_SECURE_DEV_PKG:am57xx = "${TI_SECURE_DEV_PKG_AUTO}/am5x"
-TI_SECURE_DEV_PKG:dra7xx = "${TI_SECURE_DEV_PKG_AUTO}/dra7"
-
-# The SECDEV scripts may need their own location provided through the environment
-export TI_SECURE_DEV_PKG

meta-ti-bsp/classes/uboot-sign-legacyhs.bbclass

@@ -1,131 +0,0 @@
-# This file is part of U-Boot verified boot support and is intended to be
-# inherited from u-boot recipe and from kernel-fitimage.bbclass.
-#
-# The signature procedure requires the user to generate an RSA key and
-# certificate in a directory and to define the following variable:
-#
-#   UBOOT_SIGN_KEYDIR = "/keys/directory"
-#   UBOOT_SIGN_KEYNAME = "dev" # keys name in keydir (eg. "dev.crt", "dev.key")
-#   UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000"
-#   UBOOT_SIGN_ENABLE = "1"
-#
-# As verified boot depends on fitImage generation, following is also required:
-#
-#   KERNEL_CLASSES ?= " kernel-fitimage "
-#   KERNEL_IMAGETYPE ?= "fitImage"
-#
-# The signature support is limited to the use of CONFIG_OF_SEPARATE in U-Boot.
-#
-# The tasks sequence is set as below, using DEPLOY_IMAGE_DIR as common place to
-# treat the device tree blob:
-#
-# * u-boot:do_install:append
-#   Install UBOOT_DTB_BINARY to datadir, so that kernel can use it for
-#   signing, and kernel will deploy UBOOT_DTB_BINARY after signs it.
-#
-# * virtual/kernel:do_assemble_fitimage
-#   Sign the image
-#
-# * u-boot:do_deploy[postfuncs]
-#   Deploy files like UBOOT_DTB_IMAGE, UBOOT_DTB_SYMLINK and others.
-#
-# For more details on signature process, please refer to U-Boot documentation.
-
-# Signature activation.
-UBOOT_SIGN_ENABLE ?= "0"
-
-# Default value for deployment filenames.
-UBOOT_DTB_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.dtb"
-UBOOT_DTB_BINARY ?= "u-boot.dtb"
-UBOOT_DTB_SYMLINK ?= "u-boot-${MACHINE}.dtb"
-UBOOT_NODTB_IMAGE ?= "u-boot-nodtb-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_NODTB_BINARY ?= "u-boot-nodtb.${UBOOT_SUFFIX}"
-UBOOT_NODTB_SYMLINK ?= "u-boot-nodtb-${MACHINE}.${UBOOT_SUFFIX}"
-
-# Functions in this bbclass is for u-boot only
-UBOOT_PN = "${@d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'}"
-
-concat_dtb_helper() {
-	if [ -e "${UBOOT_DTB_BINARY}" ]; then
-		ln -sf ${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_BINARY}
-		ln -sf ${UBOOT_DTB_IMAGE} ${DEPLOYDIR}/${UBOOT_DTB_SYMLINK}
-	fi
-
-	if [ -f "${UBOOT_NODTB_BINARY}" ]; then
-		install ${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
-		ln -sf ${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_SYMLINK}
-		ln -sf ${UBOOT_NODTB_IMAGE} ${DEPLOYDIR}/${UBOOT_NODTB_BINARY}
-	fi
-
-	# Concatenate U-Boot w/o DTB & DTB with public key
-	# (cf. kernel-fitimage.bbclass for more details)
-	deployed_uboot_dtb_binary='${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}'
-	if [ "x${UBOOT_SUFFIX}" = "ximg" -o "x${UBOOT_SUFFIX}" = "xrom" ] && \
-		[ -e "$deployed_uboot_dtb_binary" ]; then
-		oe_runmake EXT_DTB=$deployed_uboot_dtb_binary
-		install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
-	elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then
-		cd ${DEPLOYDIR}
-		cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
-	else
-		bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."
-	fi
-}
-
-concat_dtb() {
-	if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${PN}" = "${UBOOT_PN}" -a -n "${UBOOT_DTB_BINARY}" ]; then
-		mkdir -p ${DEPLOYDIR}
-		if [ -n "${UBOOT_CONFIG}" ]; then
-			for config in ${UBOOT_MACHINE}; do
-				CONFIG_B_PATH="${config}"
-				cd ${B}/${config}
-				concat_dtb_helper
-			done
-		else
-			CONFIG_B_PATH=""
-			cd ${B}
-			concat_dtb_helper
-		fi
-	fi
-}
-
-# Install UBOOT_DTB_BINARY to datadir, so that kernel can use it for
-# signing, and kernel will deploy UBOOT_DTB_BINARY after signs it.
-install_helper() {
-	if [ -f "${UBOOT_DTB_BINARY}" ]; then
-		install -d ${D}${datadir}
-		# UBOOT_DTB_BINARY is a symlink to UBOOT_DTB_IMAGE, so we
-		# need both of them.
-		install ${UBOOT_DTB_BINARY} ${D}${datadir}/${UBOOT_DTB_IMAGE}
-		ln -sf ${UBOOT_DTB_IMAGE} ${D}${datadir}/${UBOOT_DTB_BINARY}
-	else
-		bbwarn "${UBOOT_DTB_BINARY} not found"
-	fi
-}
-
-do_install:append() {
-	if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${PN}" = "${UBOOT_PN}" -a -n "${UBOOT_DTB_BINARY}" ]; then
-		if [ -n "${UBOOT_CONFIG}" ]; then
-			for config in ${UBOOT_MACHINE}; do
-				cd ${B}/${config}
-				install_helper
-			done
-		else
-			cd ${B}
-			install_helper
-		fi
-	fi
-}
-
-python () {
-    if d.getVar('UBOOT_SIGN_ENABLE') == '1' and d.getVar('PN') == d.getVar('UBOOT_PN') and d.getVar('UBOOT_DTB_BINARY'):
-        kernel_pn = d.getVar('PREFERRED_PROVIDER_virtual/kernel')
-
-        # Make "bitbake u-boot -cdeploy" deploys the signed u-boot.dtb
-        d.appendVarFlag('do_deploy', 'depends', ' %s:do_deploy' % kernel_pn)
-
-        # kernerl's do_deploy is a litle special, so we can't use
-        # do_deploy:append, otherwise it would override
-        # kernel_do_deploy.
-        d.appendVarFlag('do_deploy', 'prefuncs', ' concat_dtb')
-}

meta-ti-bsp/conf/layer.conf

@@ -1,34 +0,0 @@
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-METATIBASE := '${@os.path.normpath("${LAYERDIR}/")}'
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "meta-ti-bsp"
-BBFILE_PATTERN_meta-ti-bsp := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-ti-bsp = "6"
-
-LAYERSERIES_COMPAT_meta-ti-bsp = "kirkstone langdale mickledore nanbield"
-
-LICENSE_PATH += "${LAYERDIR}/licenses"
-
-LAYERDEPENDS_meta-ti-bsp = " \
-    core \
-    meta-arm \
-"
-
-BBFILES_DYNAMIC += " \
-    clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \
-"
-
-SIGGEN_EXCLUDERECIPES_ABISAFE += " \
-    mesa-pvr \
-"
-
-HOSTTOOLS_NONFATAL += "truncate xxd comm"
-
-TI_COMMON_DEPLOY ?= "${TOPDIR}/deploy-ti"
-DEPLOY_DIR_IMAGE:ti-soc = "${TI_COMMON_DEPLOY}/images/${MACHINE}"
-SDK_DEPLOY:ti-soc = "${TI_COMMON_DEPLOY}/sdk"
-PSEUDO_IGNORE_PATHS:append:ti-soc = ",${TI_COMMON_DEPLOY}"

meta-ti-bsp/conf/machine/am335x-hs-evm.conf

@@ -1,26 +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"
-
-# FIT image for legacy secure devices
-KERNEL_CLASSES += " kernel-fitimage-legacyhs"
-KERNEL_IMAGETYPES += " fitImage"
-
-# FIT image settings
-FITIMAGE_HASH_ALGO = ""
-FITIMAGE_DTB_BY_NAME = "1"
-FITIMAGE_TEE_BY_NAME = "1"
-FITIMAGE_CONF_BY_NAME = "1"

meta-ti-bsp/conf/machine/am437x-hs-evm.conf

@@ -1,28 +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"
-
-OPTEEMACHINE = "ti-am43xx"
-OPTEEFLAVOR = "am43xx"
-
-EXTRA_IMAGEDEPENDS += "optee-os"
-
-# FIT image for legacy secure devices
-KERNEL_CLASSES += " kernel-fitimage-legacyhs"
-KERNEL_IMAGETYPES += " fitImage"
-
-# FIT image settings
-FITIMAGE_HASH_ALGO = ""
-FITIMAGE_PACK_TEE = "1"
-FITIMAGE_DTB_BY_NAME = "1"
-FITIMAGE_TEE_BY_NAME = "1"
-FITIMAGE_CONF_BY_NAME = "1"

meta-ti-bsp/conf/machine/am57xx-hs-evm.conf

@@ -1,29 +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"
-
-OPTEEMACHINE = "ti-am57xx"
-OPTEEFLAVOR = "am57xx"
-OPTEEPAGER = "y"
-
-EXTRA_IMAGEDEPENDS += "optee-os"
-
-# FIT image for legacy secure devices
-KERNEL_CLASSES += " kernel-fitimage-legacyhs"
-KERNEL_IMAGETYPES += " fitImage"
-
-# FIT image settings
-FITIMAGE_HASH_ALGO = ""
-FITIMAGE_PACK_TEE = "1"
-FITIMAGE_DTB_BY_NAME = "1"
-FITIMAGE_TEE_BY_NAME = "1"
-FITIMAGE_CONF_BY_NAME = "1"

meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf

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

meta-ti-bsp/conf/machine/am62axx-evm.conf

@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62AXX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62AXX EVM
-
-require conf/machine/include/am62axx.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62a7 \
-    ti/k3-am62x-sk \
-    ti/k3-fpdlink \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am62a7-sk.dtb \
-"
-
-UBOOT_MACHINE = "am62ax_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf

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

meta-ti-bsp/conf/machine/am62pxx-evm.conf

@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62PX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62PX EVM
-
-require conf/machine/include/am62pxx.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62p5 \
-    ti/k3-am62x-sk-csi2 \
-    ti/k3-am62x-sk-hdmi \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am62p5-sk.dtb \
-"
-
-UBOOT_MACHINE = "am62px_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf

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

meta-ti-bsp/conf/machine/am62xx-evm.conf

@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX EVM
-
-require conf/machine/include/am62xx.inc
-require conf/machine/include/ti-extras.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am625 \
-    ti/k3-am62x-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am625-sk.dtb \
-"
-
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf

@@ -1,11 +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
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"

meta-ti-bsp/conf/machine/am62xx-lp-evm.conf

@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX LP EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX LP EVM
-
-require conf/machine/include/am62xx.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am62-lp \
-    ti/k3-am625-sk \
-    ti/k3-am62x-sk-hdmi \
-    ti/k3-am62x-sk-mcan \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am62-lp-sk.dtb \
-"
-
-UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"

meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf

@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX SIP EVM (R5F)
-#@DESCRIPTION: Machine configuration for the TI AM62xx SIP EVM (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs-fs"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-
-# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
-# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
-# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
-UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"

meta-ti-bsp/conf/machine/am62xxsip-evm.conf

@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: AM62XX SIP EVM
-#@DESCRIPTION: Machine configuration for the TI AM62XX SIP EVM
-
-require conf/machine/include/am62xx.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-am625 \
-    ti/k3-am62x-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am625-sk.dtb \
-"
-
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"

meta-ti-bsp/conf/machine/am64xx-evm-k3r5.conf

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

meta-ti-bsp/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"

meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf

@@ -1,11 +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_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am65x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am65xx-evm.conf

@@ -1,9 +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"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2"

meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf

@@ -1,11 +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_sr2"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "hs"
-
-UBOOT_MACHINE = "am65x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/am65xx-hs-evm.conf

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

meta-ti-bsp/conf/machine/beagle-x15.conf

@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBoard X15
-#@DESCRIPTION: Machine configuration for the BeagleBoard X15
-
-require conf/machine/include/am57xx.inc
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-
-KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
-
-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"

meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf

@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBone AI-64 (R5F)
-#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (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"

meta-ti-bsp/conf/machine/beaglebone-ai64.conf

@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBone AI-64 (A72)
-#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
-
-require conf/machine/include/j721e.inc
-
-UBOOT_MACHINE = "j721e_evm_a72_config"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-
-KERNEL_DEVICETREE = " \
-ti/k3-j721e-beagleboneai64.dtb \
-ti/k3-j721e-common-proc-board.dtb \
-ti/k3-j721e-evm-csi2-ov5640.dtbo \
-ti/k3-j721e-evm-fusion.dtbo \
-ti/k3-j721e-evm-gesi-exp-board.dtbo \
-ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
-ti/k3-j721e-evm-virt-mac-client.dtbo \
-ti/k3-j721e-sk-csi2-ov5640.dtbo \
-ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
-ti/k3-j721e-sk-fusion.dtbo \
-ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
-ti/k3-j721e-sk.dtb \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"

meta-ti-bsp/conf/machine/beaglebone.conf

@@ -1,23 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeagleBone machine
-#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
-
-require conf/machine/include/ti33x.inc
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-
-KERNEL_DEVICETREE_PREFIX = "am335x-bone"
-
-KERNEL_DEVICETREE = " \
-    am335x-bone.dtb \
-    am335x-boneblue.dtb \
-    am335x-boneblack.dtb \
-    am335x-boneblack-wireless.dtb \
-    am335x-bonegreen.dtb \
-    am335x-bonegreen-wireless.dtb \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"
-MACHINE_FEATURES += "screen"
-
-SERIAL_CONSOLES = "115200;ttyS0"

meta-ti-bsp/conf/machine/beagleplay-k3r5.conf

@@ -1,14 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (R5F)
-#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
-
-require conf/machine/include/k3r5.inc
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
-
-SYSFW_SOC = "am62x"
-SYSFW_CONFIG = "evm"
-SYSFW_SUFFIX = "gp"
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"

meta-ti-bsp/conf/machine/beagleplay.conf

@@ -1,43 +0,0 @@
-#@TYPE: Machine
-#@NAME: BeaglePlay (A53)
-#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
-
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am62xx"
-
-MACHINE_FEATURES += "screen gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
-UBOOT_MACHINE = "am62x_evm_a53_defconfig"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-bb.org"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
-PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
-
-KERNEL_DEVICETREE = " \
-ti/k3-am625-beagleplay.dtb \
-ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
-ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-sk.dtb \
-ti/k3-am625-sk-csi2-ov5640.dtbo \
-ti/k3-am625-sk-csi2-tevi-ov5640.dtbo \
-ti/k3-am625-sk-dmtimer-pwm.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-mcspi-loopback.dtbo \
-ti/k3-am625-sk-mcu-gpio-wakeup.dtbo \
-ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
-ti/k3-am625-sk-rpi-hdr-pwm.dtbo \
-"
-
-MACHINE_GUI_CLASS = "bigscreen"

meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf

@@ -1,29 +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"
-
-OPTEEMACHINE = "ti-dra7xx"
-OPTEEFLAVOR = "dra7xx"
-OPTEEPAGER = "y"
-
-EXTRA_IMAGEDEPENDS += "optee-os"
-
-# FIT image for legacy secure devices
-KERNEL_CLASSES += " kernel-fitimage-legacyhs"
-KERNEL_IMAGETYPES += " fitImage"
-
-# FIT image settings
-FITIMAGE_HASH_ALGO = ""
-FITIMAGE_PACK_TEE = "1"
-FITIMAGE_DTB_BY_NAME = "1"
-FITIMAGE_TEE_BY_NAME = "1"
-FITIMAGE_CONF_BY_NAME = "1"

meta-ti-bsp/conf/machine/include/am57xx.inc

@@ -1,7 +0,0 @@
-require conf/machine/include/omap-a15.inc
-SOC_FAMILY:append = ":dra7xx"
-SOC_FAMILY:append = ":am57xx"
-
-MACHINE_FEATURES += "pci"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw"

meta-ti-bsp/conf/machine/include/am62axx.inc

@@ -1,20 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am62axx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-# Default tiboot3.bin on AM62A is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
-
-# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am62x"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"

meta-ti-bsp/conf/machine/include/am62pxx.inc

@@ -1,19 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am62pxx"
-
-MACHINE_FEATURES += "screen gpu"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-
-# Default tiboot3.bin on AM62Px is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cnm-wave-fw"
-
-SERIAL_CONSOLES = "115200;ttyS2"

meta-ti-bsp/conf/machine/include/am62xx.inc

@@ -1,27 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am62xx"
-
-MACHINE_FEATURES += "screen gpu"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-
-# Default tiboot3.bin on AM62x is for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM62x is for HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin"
-
-# Since default tiboot3.bin on AM62x is for HS-FS, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin"
-
-# Bitmap image tarball for early splashscreen
-IMAGE_BOOT_FILES += "ti_logo_414x97_32bpp.bmp.gz"
-
-TFA_BOARD = "lite"
-TFA_K3_SYSTEM_SUSPEND = "1"
-
-OPTEEMACHINE = "k3-am62x"
-
-# Normally AM62 boards use ttyS2, but our Jailhouse inmate may use ttyS3, so try both
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"

meta-ti-bsp/conf/machine/include/am64xx.inc

@@ -1,24 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am64xx"
-
-KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am642-evm.dtb \
-    ti/k3-am642-sk.dtb \
-"
-
-# Default tiboot3.bin on AM64x is for SR2.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for GP
-IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin"
-
-# Since default tiboot3.bin on AM64x is for SR2.0 HS-FS, add a version for SR2.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin"
-
-TFA_BOARD = "lite"
-
-OPTEEMACHINE = "k3-am64x"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2"

meta-ti-bsp/conf/machine/include/am65xx.inc

@@ -1,29 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am65xx"
-
-MACHINE_FEATURES += "screen touchscreen gpu"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
-
-KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am654-base-board.dtb \
-"
-
-IMAGE_BOOT_FILES += "sysfw.itb"
-
-# Default on AM65x is for GP
-IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb"
-
-# Since default on AM65x is for GP, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb"
-
-TFA_BOARD = "generic"
-
-OPTEEMACHINE = "k3-am65x"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw-am65x"

meta-ti-bsp/conf/machine/include/dra7xx.inc

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

meta-ti-bsp/conf/machine/include/j7200.inc

@@ -1,17 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":j7200"
-
-# Default tiboot3.bin on J7200 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
-
-# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
-
-# Since default tiboot3.bin on J721e is for GP, add a version for SR2.0 HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin"
-
-TFA_BOARD = "generic"
-
-OPTEEMACHINE = "k3-j721e"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw"

meta-ti-bsp/conf/machine/include/j721e.inc

@@ -1,27 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":j721e"
-
-MACHINE_FEATURES += "screen gpu"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-
-IMAGE_BOOT_FILES += "sysfw.itb"
-
-# Default on J721e is for GP
-IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
-
-# Since default on J721e is for GP, add a version for HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb"
-
-# Since default on J721e is for GP, add a version for HS-SE
-IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin"
-IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb"
-
-TFA_BOARD = "generic"
-
-OPTEEMACHINE = "k3-j721e"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw"

meta-ti-bsp/conf/machine/include/j721s2.inc

@@ -1,19 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":j721s2"
-
-MACHINE_FEATURES += "screen gpu"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-
-# Default tiboot3.bin on J721S2 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
-
-# Since default tiboot3.bin on J721S2 is for GP, add a version for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
-
-TFA_BOARD = "generic"
-
-OPTEEMACHINE = "k3-j784s4"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"

meta-ti-bsp/conf/machine/include/j784s4.inc

@@ -1,19 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":j784s4"
-
-MACHINE_FEATURES += "screen gpu"
-
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
-
-# Default tiboot3.bin on J784S4 is for GP
-IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
-
-# Since default tiboot3.bin on J784S4 is for GP, add a version for SR1.0 HS-FS
-IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
-
-TFA_BOARD = "j784s4"
-
-OPTEEMACHINE = "k3-j784s4"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw"

meta-ti-bsp/conf/machine/include/k3.inc

@@ -1,67 +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 = "0x81000000"
-UBOOT_LOADADDRESS = "0x81000000"
-UBOOT_RD_LOADADDRESS = "0x84000000"
-UBOOT_RD_ENTRYPOINT = "0x84000000"
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83080000"
-UBOOT_DTBO_OFFSET = "0x00010000"
-
-SPL_BINARY = "tispl.bin"
-SPL_BINARYNAME = "tispl.bin"
-UBOOT_SUFFIX = "img"
-
-UBOOT_SIGN_ENABLE = "1"
-UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
-UBOOT_SIGN_KEYNAME ?= "custMpk"
-UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
-FIT_HASH_ALG ?= "sha512"
-FIT_SIGN_ALG ?= "rsa4096"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-image"
-
-TFA_PLATFORM = "k3"
-
-# 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 = "apm usbgadget usbhost vfat ext2 alsa pci"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-
-IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
-
-EFI_PROVIDER ?= "grub-efi"
-MACHINE_FEATURES += "efi"
-
-WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
-
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
-
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"

meta-ti-bsp/conf/machine/include/k3r5.inc

@@ -1,27 +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/arm/armv7a/tune-cortexa8.inc
-
-# R5 runs early bootloader and loads SYSFW
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
-
-SPL_SUFFIX = "bin"
-SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
-SPL_SYMLINK = "tiboot3.${SPL_SUFFIX}"
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "u-boot-r5spl.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "u-boot-r5spl-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "u-boot-r5spl-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-PACKAGECONFIG:pn-u-boot-ti-staging = ""
-PACKAGECONFIG:pn-u-boot-ti-mainline = ""

meta-ti-bsp/conf/machine/include/mesa-pvr.inc

@@ -1,8 +0,0 @@
-PREFERRED_PROVIDER_virtual/mesa ?= "mesa-pvr"
-PREFERRED_PROVIDER_virtual/egl ?= "mesa-pvr"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-pvr"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-pvr"
-PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa-pvr"
-PREFERRED_PROVIDER_virtual/libgbm ?= "mesa-pvr"
-PREFERRED_PROVIDER_virtual/libglx ?= "mesa-pvr"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-pvr"

meta-ti-bsp/conf/machine/include/omap-a15.inc

@@ -1,57 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":omap-a15"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa15.inc
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r7"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
-
-# Graphics providers and variables
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
-
-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"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw"
-
-# 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 = "apm usbgadget usbhost vfat ext2 screen alsa 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] += "virtual/bootloader:do_deploy"

meta-ti-bsp/conf/machine/include/omapl138.inc

@@ -1,16 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":omapl138"
-
-require conf/machine/include/arm/armv5/tune-arm926ejs.inc
-
-KERNEL_IMAGETYPE = "zImage"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
-
-MACHINE_FEATURES = "serial usbhost usbgadget alsa"

meta-ti-bsp/conf/machine/include/ti-extras.inc

@@ -1,4 +0,0 @@
-# Add TI_EXTRAS to machine overrides so we get access to e.g. 'jailhouse'
-
-TI_EXTRAS ??= ""
-MACHINEOVERRIDES =. "${@ '${TI_EXTRAS}:' if d.getVar('TI_EXTRAS').startswith('tie-') else ''}"

meta-ti-bsp/conf/machine/include/ti-soc.inc

@@ -1,9 +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"
-
-# TI platforms all use devicetrees with overlays
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
-KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
-
-require conf/machine/include/soc-family.inc

meta-ti-bsp/conf/machine/include/ti33x.inc

@@ -1,76 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":ti33x"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa8.inc
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r22"
-
-# 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"
-
-# Graphics providers and variables
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"
-
-KERNEL_IMAGETYPE = "zImage"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    am335x \
-    ti/omap/am335x \
-"
-
-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 \
-"
-
-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_KERNEL_ARGS = "rootwait rw earlycon"
-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"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
-
-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"

meta-ti-bsp/conf/machine/include/ti43x.inc

@@ -1,72 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":ti43x"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa9.inc
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r3"
-
-# 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"
-
-# Graphics providers and variables
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
-PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
-
-KERNEL_IMAGETYPE = "zImage"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    am437x \
-    am43x \
-    ti/omap/am437x \
-    ti/omap/am43x \
-"
-
-KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb \
-    am437x-sk-evm.dtb \
-    am437x-idk-evm.dtb \
-    am43x-epos-evm.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"
-
-# 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"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
-
-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"

meta-ti-bsp/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"

meta-ti-bsp/conf/machine/j7200-evm.conf

@@ -1,13 +0,0 @@
-#@TYPE: Machine
-#@NAME: J7200 EVM
-#@DESCRIPTION: Machine configuration for the TI J7200 EVM
-
-require conf/machine/include/j7200.inc
-
-KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j7200-common-proc-board.dtb \
-"
-
-UBOOT_MACHINE = "j7200_evm_a72_config"

meta-ti-bsp/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_evm_r5_defconfig"

meta-ti-bsp/conf/machine/j7200-hs-evm.conf

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

meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf

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

meta-ti-bsp/conf/machine/j721e-evm.conf

@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721e EVM
-#@DESCRIPTION: Machine configuration for the TI J721e EVM
-
-require conf/machine/include/j721e.inc
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j721e \
-    ti/k3-fpdlink \
-    ti/k3-j7200-evm-mcspi-loopback \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721e-common-proc-board.dtb \
-    ti/k3-j721e-sk.dtb \
-"
-
-UBOOT_MACHINE = "j721e_evm_a72_config"

meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf

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

meta-ti-bsp/conf/machine/j721e-hs-evm.conf

@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721e HS EVM
-#@DESCRIPTION: Machine configuration for the TI J721e HS EVM
-
-require conf/machine/j721e-evm.conf
-
-UBOOT_MACHINE = "j721e_evm_a72_defconfig"

meta-ti-bsp/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"

meta-ti-bsp/conf/machine/j721s2-evm.conf

@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 EVM
-#@DESCRIPTION: Machine configuration for the TI J721S2 EVM
-
-require conf/machine/include/j721s2.inc
-
-TFA_K3_USART = "0x8"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j721s2 \
-    ti/k3-fpdlink \
-    ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am68-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j721s2-common-proc-board.dtb \
-"
-
-UBOOT_MACHINE = "j721s2_evm_a72_defconfig"

meta-ti-bsp/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_evm_r5_defconfig"

meta-ti-bsp/conf/machine/j721s2-hs-evm.conf

@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: J721S2 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
-
-require conf/machine/j721s2-evm.conf

meta-ti-bsp/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"

meta-ti-bsp/conf/machine/j784s4-evm.conf

@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 EVM
-#@DESCRIPTION: Machine configuration for the TI J784S4 EVM
-
-require conf/machine/include/j784s4.inc
-
-TFA_K3_USART = "0x8"
-OPTEE_K3_USART = "0x8"
-
-KERNEL_DEVICETREE_PREFIX = " \
-    ti/k3-j784s4 \
-    ti/k3-fpdlink \
-    ti/k3-j7200-evm-mcspi-loopback \
-    ti/k3-am69-sk \
-"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-j784s4-evm.dtb \
-"
-
-UBOOT_MACHINE = "j784s4_evm_a72_defconfig"

meta-ti-bsp/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"

meta-ti-bsp/conf/machine/j784s4-hs-evm.conf

@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: J784S4 HS EVM
-#@DESCRIPTION: Machine configuration for the TI J784S4 HS EVM
-
-require conf/machine/j784s4-evm.conf

meta-ti-bsp/conf/machine/omapl138-lcdk.conf

@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: OMAP-L138 LCDK
-#@DESCRIPTION: Machine configuration for the TI OMAP-L138 LCDK board
-
-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_PREFIX = " \
-    da850 \
-    ti/davinci/da850 \
-"
-
-KERNEL_DEVICETREE = " \
-    da850-evm.dtb \
-    da850-lcdk.dtb \
-"

meta-ti-bsp/conf/multiconfig/k3r5.conf

@@ -1,7 +0,0 @@
-MAINMACHINE := "${MACHINE}"
-
-DEPLOY_DIR_IMAGE:k3r5 = "${TI_COMMON_DEPLOY}/images/${MAINMACHINE}"
-
-MACHINE:append = "-k3r5"
-TCLIBC = "baremetal"
-SDKPKGSUFFIX = "k3r5-nativesdk"

meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend

@@ -1,14 +0,0 @@
-# This is a copy of meta-clang/recipes-graphics/mesa/mesa_%.bbappend required
-# for llvmpipe when using pvr-mesa since we aren't caught by that glob.
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-LDFLAGS:append:toolchain-clang = " -latomic -lm"
-DEPENDS:append:toolchain-clang = " libatomic-ops"
-
-EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false"
-EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false"
-
-export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
-
-PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils"

meta-ti-bsp/licenses/TI-IMG

@@ -1,63 +0,0 @@
-This license applies to the Imagination D5520 firmware image, pvdec_full_bin.fw.
-
-Copyright (C) 2019 Texas Instruments Incorporated
-
-All rights reserved not granted herein.
-
-Limited License.
-
-Texas Instruments Incorporated grants a world-wide, royalty-free, non-exclusive
-license under copyrights and patents it now or hereafter owns or controls to
-make, have made, use, import, offer to sell and sell ("Utilize") this software
-subject to the terms herein. With respect to the foregoing patent license, such
-license is granted solely to the extent that any such patent is necessary to
-Utilize the software alone. The patent license shall not apply to any
-combinations which include this software, other than combinations with devices
-manufactured by or for TI (“TI Devices”). No hardware patent is licensed
-hereunder.
-
-Redistributions must preserve existing copyright notices and reproduce this
-license (including the above copyright notice and the disclaimer and
-(if applicable) source code license limitations below) in the documentation
-and/or other materials provided with the distribution
-
-Redistribution and use in binary form, without modification, are permitted
-provided that the following conditions are met:
-
-	* No reverse engineering, decompilation, or disassembly of this
-	  software is permitted with respect to any software provided in binary
-	  form.
-
-	* any redistribution and use are licensed by TI for use only with TI
-	  Devices.
-
-	* Nothing shall obligate TI to provide you with source code for the
-	  software licensed and provided to you in object code.
-
-If software source code is provided to you, modification and redistribution of
-the source code are permitted provided that the following conditions are met:
-
-	* any redistribution and use of the source code, including any
-	  resulting derivative works, are licensed by TI for use only with TI
-	  Devices.
-
-	* any redistribution and use of any object code compiled from the
-	  source code and any resulting derivative works, are licensed by TI
-	  for use only with TI Devices.
-
-Neither the name of Texas Instruments Incorporated nor the names of its
-suppliers may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-DISCLAIMER.
-
-THIS SOFTWARE IS PROVIDED BY TI AND TI’S LICENSORS "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 TI AND TI’S LICENSORS 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.

meta-ti-bsp/licenses/TI-TFL

@@ -1,62 +0,0 @@
-TEXAS INSTRUMENTS TEXT FILE LICENSE
-
-Copyright (c) [earliest year] - [latest year] Texas Instruments Incorporated
-
-All rights reserved not granted herein.
-
-Limited License.
-
-Texas Instruments Incorporated grants a world-wide, royalty-free,
-non-exclusive license under copyrights and patents it now or hereafter owns
-or controls to make, have made, use, import, offer to sell and sell
-("Utilize") this software subject to the terms herein.  With respect to the
-foregoing patent license, such license is granted  solely to the extent that
-any such patent is necessary to Utilize the software alone.  The patent
-license shall not apply to any combinations which include this software,
-other than combinations with devices manufactured by or for TI ("TI
-Devices").  No hardware patent is licensed hereunder.
-
-Redistributions must preserve existing copyright notices and reproduce this
-license (including the above copyright notice and the disclaimer and (if
-applicable) source code license limitations below) in the documentation
-and/or other materials provided with the distribution
-
-Redistribution and use in binary form, without modification, are permitted
-provided that the following conditions are met:
-
-* No reverse engineering, decompilation, or disassembly of this software is
-permitted with respect to any software provided in binary form.
-
-* any redistribution and use are licensed by TI for use only with TI
-Devices.
-
-* Nothing shall obligate TI to provide you with source code for the software
-licensed and provided to you in object code.
-
-If software source code is provided to you, modification and redistribution
-of the source code are permitted provided that the following conditions are
-met:
-
-* any redistribution and use of the source code, including any resulting
-derivative works, are licensed by TI for use only with TI Devices.
-
-* any redistribution and use of any object code compiled from the source
-code and any resulting derivative works, are licensed by TI for use only
-with TI Devices.
-
-Neither the name of Texas Instruments Incorporated nor the names of its
-suppliers may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-DISCLAIMER.
-
-THIS SOFTWARE IS PROVIDED BY TI AND TI'S LICENSORS "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 TI AND TI'S LICENSORS 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.

meta-ti-bsp/licenses/TI-TSPA

@@ -1,206 +0,0 @@
-Texas Instruments Incorporated
-Technology and Software Publicly Available
-Software License Agreement
-
-
-Important - Please read the following license agreement carefully.  This is
-a legally binding agreement.  Do not click "i have read and agree" or use
-(as applicable) the Licensed Materials unless: (1) you are authorized to
-accept and agree to the terms of this license agreement on behalf of
-yourself or your company (as applicable) and (2) you intend to be bound by
-the terms of this license agreement on behalf of yourself or your company
-(as applicable).
-
-This Software License Agreement ("Agreement") is a legal agreement between
-you (either an individual or entity) and Texas Instruments Incorporated
-("TI"), 12500 TI Boulevard, Dallas, Texas 75243.  The "Licensed Materials"
-subject to this Agreement include the software programs (in whole or in
-part), that accompany this Agreement and set forth in the applicable
-software manifest and which you access "on-line" and/or electronic
-documentation (in whole or in part) associated and provided with these
-software programs.  By installing, copying or otherwise using the Licensed
-Materials you agree to abide by the terms of this Agreement.  If you choose
-not to accept or agree with these terms, do not download or install the
-Licensed Materials.
-
-Note Regarding Possible Access to Open Source Software:  The Licensed
-Materials may be bundled with Open Source Software.  "Open Source Software"
-means any software licensed under terms requiring that (A) other software
-("Proprietary Software") incorporated, combined or distributed with such
-software or developed using such software: (i) be disclosed or distributed
-in source code form; or (ii) otherwise be licensed on terms inconsistent
-with the terms of this Agreement, including but not limited to permitting
-use of the Proprietary Software on or with devices other than TI Devices, or
-(B) require the owner of Proprietary Software to license any of its patents
-to users of the Open Source Software and/or Proprietary Software
-incorporated, combined or distributed with such Open Source Software or
-developed using such Open Source Software.
-
-You may gain access to Open Source Software, in which case such Open Source
-Software will be listed in the applicable software manifest (in whole or in
-part, the "Open Source Materials").  Your use of the Open Source Materials
-is subject to the separate licensing terms applicable to such Open Source
-Materials as specified in the applicable software manifest.  For
-clarification, this Agreement does not limit your rights under, or grant you
-rights that supersede, the license terms of any applicable Open Source
-Materials license agreement.  If any of the Open Source Materials have been
-provided to you in object code only, TI will provide to you or show you
-where can access the source code versions of such Open Source Materials if
-you contact TI at Texas Instruments Incorporated, 12500 TI Boulevard, Mail
-Station 8638, Dallas, Texas 75243, Attention: Contracts Manager.  You may
-terminate this Agreement in the event you choose not to accept or agree with
-the terms in any applicable Open Source Materials license agreement,
-provided that such termination occurs within five (5) calendar days of
-acceptance of this Agreement and you abide by all applicable license terms
-in this Agreement until such termination.
-
-1. License.
-
-a. Source Code License.  For the Licensed Materials provided in source code
-format, TI hereby grants to you a limited, non-exclusive license to
-reproduce, use, and create modified or derivative works of the Licensed
-Materials provided to you in source code format and to distribute an
-unlimited number of copies of such source code Licensed Materials, or any
-derivatives thereof, in any format.
-
-b.  Object Code License.  For the Licensed Materials provided in object code
-format, TI hereby grants to you a limited, non-exclusive license to
-reproduce and use the Licensed Materials provided to you in object code
-format and to distribute an unlimited number of object or executable copies
-of such object code Licensed Materials.
-
-2. Termination.  This Agreement is effective until terminated.  Without
-prejudice to any other rights, TI may terminate your right to use the
-Licensed Materials under this Agreement if you fail to comply with the terms
-of this Agreement.  In such event, you shall destroy all copies of the
-Licensed Materials, including all portions and derivatives thereof.
-
-3. Intellectual Property Rights.
-
-a. The Licensed Materials being provided to you hereunder are being made
-publicly available by TI, even though they contain copyrighted material of
-TI and its licensors, if applicable.   In no event may you alter, remove or
-destroy any copyright notice included in the Licensed Materials.  To the
-extent that any of the Licensed Materials are provided in binary or object
-code only, you may not unlock, decompile, reverse engineer, disassemble or
-otherwise translate such binary or object code to human-perceivable form.
-The source code of such reverse engineered code may contain TI trade secret
-and other proprietary information. TI reserves all rights not specifically
-granted under this Agreement.
-
-b. Certain Licensed Materials may (i) require patent licenses from third
-parties claiming patent rights covering implementation of the Licensed
-Materials or (ii) be based on industry recognized standards or software
-programs published by industry recognized standards bodies and certain third
-parties may claim to own patents or copyrights that cover implementation of
-those standards.  You acknowledge and agree that this Agreement does not
-convey a license to any such third party patents and copyrights.
-
-c. YOU ACKNOWLEDGE AND AGREE THAT TI SHALL NOT BE LIABLE FOR AND SHALL NOT
-DEFEND OR INDEMNIFY YOU AGAINST ANY THIRD PARTY INFRINGEMENT CLAIM THAT
-RELATES TO OR IS BASED ON YOUR MANUFACTURE, USE, OR DISTRIBUTION OF THE
-LICENSED MATERIALS OR YOUR MANUFACTURE, USE, OFFER FOR SALE, SALE,
-IMPORTATION OR DISTRIBUTION OF YOUR PRODUCTS THAT INCLUDE OR INCORPORATE THE
-LICENSED MATERIALS.
-
-d. You acknowledge and agree that you are responsible for any fees or
-royalties that may be payable to any third party based on such third party's
-interests in the Licensed Materials described in Section 3(b) above (the
-"Third Party Payment Obligations").  You agree to indemnify TI against any
-Third Party Payment Obligations and will defend any claim, suit or
-proceeding brought against TI insofar as such claim, suit or proceeding is
-based on your failure to pay any Third Party Payment Obligations.
-
-4. Warranties and Limitations.  THE LICENSED MATERIALS ARE PROVIDED "AS IS".
-TI AND ITS LICENSORS MAKE NO WARRANTY OR REPRESENTATION, EXPRESS, IMPLIED OR
-STATUTORY, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTIBILITY, FITNESS FOR
-A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS OF
-RESPONSES, RESULTS AND LACK OF NEGLIGENCE.  TI DISCLAIMS ANY WARRANTY OF
-TITLE, QUIET ENJOYMENT, QUIET POSESSION, AND NON-INFRINGEMENT OF ANY THIRD
-PARTY INTELLECTUAL PROPERTY RIGHTS WITH REGARD TO THE LICENSED MATERIALS OR
-USE OF THOSE MATERIALS.
-
-YOU ACKNOWLEDGE AND AGREE THAT THE LICENSED MATERIALS MAY NOT BE INTENDED
-FOR PRODUCTION APPLICATIONS AND MAY CONTAIN IRREGULARITIES AND DEFECTS NOT
-FOUND IN PRODUCTION SOFTWARE.  FURTHERMORE, YOU ACKNOWLEDGE AND AGREE THAT
-THE LICENSED MATERIALS HAVE NOT BEEN TESTED OR CERTIFIED BY ANY GOVERNMENT
-AGENCY OR INDUSTRY REGULATORY ORGANIZATION OR ANY OTHER THIRD PARTY
-ORGANIZATION.  YOU AGREE THAT PRIOR TO USING, INCORPORATING OR DISTRIBUTING
-THE LICENSED MATERIALS IN OR WITH ANY COMMERCIAL PRODUCT THAT YOU WILL
-THOROUGHLY TEST THE PRODUCT AND THE FUNCTIONALITY OF THE LICENSED MATERIALS
-IN OR WITH THAT PRODUCT AND BE SOLELY RESPONSIBLE FOR ANY PROBLEMS OR
-FAILURES.
-
-IN NO EVENT SHALL TI OR ITS LICENSORS BE LIABLE FOR ANY SPECIAL, INDIRECT,
-INCIDENTAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED ON ANY THEORY
-OF LIABILITY, ARISING IN ANY WAY OUT OF THIS AGREEMENT, OR YOUR USE OF THE
-LICENSED MATERIALS, WHETHER OR NOT TI HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.  EXCLUDED DAMAGES INCLUDE, BUT ARE NOT LIMITED TO, COST OF
-REMOVAL OR REINSTALLATION, OUTSIDE COMPUTER TIME, LABOR COSTS, LOSS OR
-CORRUPTION OF DATA, LOSS OF GOODWILL, LOSS OF PROFITS, LOSS OF SAVINGS, OR
-LOSS OF USE OR INTERRUPTION OF BUSINESS OR ANY OTHER ECONOMIC LOSS.  IN NO
-EVENT WILL TI'S AGGREGATE LIABILITY UNDER THIS AGREEMENT OR ARISING OUT OF
-YOUR USE OF THE LICENSED MATERIALS EXCEED FIVE HUNDRED U.S. DOLLARS
-(US$500).
-
-Because some jurisdictions do not allow the exclusion or limitation of
-incidental or consequential damages or limitation on how long an implied
-warranty lasts, the above limitations or exclusions may not apply to you.
-
-5. Export Control.  The Licensed Materials may be subject to the export or
-import regulations of certain countries. You agree to comply with all such
-regulations and acknowledge that you have the responsibility to obtain any
-licenses or other authorizations that may be required to export, re-export
-or import the Licensed Materials.
-
-6. Governing Law, Jurisdiction and Severability.  This Agreement will be
-governed by and interpreted in accordance with the laws of the State of
-Texas, without reference to conflict of laws principles.  If for any reason
-a court of competent jurisdiction finds any provision of the Agreement to be
-unenforceable, that provision will be enforced to the maximum extent
-possible to effectuate the intent of the parties and the remainder of the
-Agreement shall continue in full force and effect. This Agreement shall not
-be governed by the United Nations Convention on Contracts for the
-International Sale of Goods, or by the Uniform Computer Information
-Transactions Act (UCITA). The parties agree that non-exclusive jurisdiction
-for any dispute arising out of or relating to this Agreement lies within the
-courts located in the State of Texas.  Notwithstanding the foregoing, any
-judgment may be enforced in any United States or foreign court, and either
-party may seek injunctive relief in any United States or foreign court.
-Failure by TI to enforce any provision of this Agreement shall not be deemed
-a waiver of future enforcement of that or any other provision in this
-Agreement or any other agreement that may be in place between the parties.
-
-7. PRC Provisions.  If you are located in the People's Republic of China
-("PRC") or if the Licensed Materials will be sent to the PRC, the following
-provisions shall apply:
-
-a. Registration Requirements.  You shall be solely responsible for
-performing all acts and obtaining all approvals that may be required in
-connection with this Agreement by the government of the PRC, including but
-not limited to registering pursuant to, and otherwise complying with, the
-PRC Measures on the Administration of Software Products, Management
-Regulations on Technology Import-Export, and Technology Import and Export
-Contract Registration Management Rules.  Upon receipt of such approvals from
-the government authorities, you shall forward evidence of all such approvals
-to TI for its records.  In the event that you fail to obtain any such
-approval or registration, you shall be solely responsible for any and all
-losses, damages or costs resulting therefrom, and shall indemnify TI for all
-such losses, damages or costs.
-
-b. Governing Language.  This Agreement is written and executed in the
-English language.  If a translation of this Agreement is required for any
-purpose, including but not limited to registration of the Agreement pursuant
-to any governmental laws, regulations or rules, you shall be solely
-responsible for creating such translation.  Any translation of this
-Agreement into a language other than English is intended solely in order to
-comply with such laws or for reference purposes, and the English language
-version shall be authoritative and controlling.
-
-8. Entire Agreement.  This is the entire agreement between you and TI and
-supersedes any prior agreement between the parties related to the subject
-matter of this Agreement. No amendment or modification of this Agreement
-will be effective unless in writing and signed by a duly authorized
-representative of TI.  You hereby warrant and represent that you have
-obtained all authorizations and other applicable consents required
-empowering you to enter into this Agreement.