22 files changed, 0 insertions, 496 deletions
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
deleted file mode 100644
index 18e3757a..00000000
--- a/conf/machine/include/am64xx.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am64xx"
-
-MACHINE_FEATURES += "screen touchscreen"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am642-evm.dtb \
-    ti/k3-am642-sk.dtb \
-    ti/k3-am642-evm-icssg1-dualemac.dtbo \
-"
-
-# AM64 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
-do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-
-TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am64x"
-TI_PDK_LIMIT_BOARDS = "am64x_evm"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0 mcu1_1 mcu2_0 mcu2_1"
diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
deleted file mode 100644
index 2838c58f..00000000
--- a/conf/machine/include/am65xx.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":am65xx"
-
-MACHINE_FEATURES += "screen touchscreen gpu"
-
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
-SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-
-KERNEL_DEVICETREE = " \
-    ti/k3-am654-base-board.dtb \
-    ti/k3-am654-base-board-sr1.dtbo \
-    ti/k3-am654-gp.dtbo \
-    ti/k3-am654-idk.dtbo \
-    ti/k3-am654-idk-sr1.dtbo \
-    ti/k3-am654-sr1.dtbo \
-    ti/k3-am654-pcie-usb2.dtbo \
-    ti/k3-am654-pcie-usb3.dtbo \
-    ti/k3-am654-evm-tc358876.dtbo \
-    ti/k3-am654-evm-oldi-lcd1evm.dtbo \
-"
-
-BBMULTICONFIG += "k3r5-sr2"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
-# Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
-IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
-do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
-
-OPTEEMACHINE = "k3-am65x"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am65xx"
-TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"
-TI_PDK_LIMIT_CORES = "mcu1_0 mpu1_0"
diff --git a/conf/machine/include/c66x.inc b/conf/machine/include/c66x.inc
deleted file mode 100644
index 33a657f1..00000000
--- a/conf/machine/include/c66x.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY:append = ":c66x"
-
-# HACK: The c66x family is composed of devices with only DSP cores, and no ARM
-#       cores. The Linux kernel is not supported on these machines.
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-dummy"
-EXTRA_IMAGEDEPENDS = ""
-
-IMAGE_FSTYPES = "tar.xz"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
deleted file mode 100644
index b8d207de..00000000
--- a/conf/machine/include/davinci.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-require conf/machine/include/arm/armv5/tune-arm926ejs.inc
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r54"
-
-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"
-
-UBOOT_MACHINE = "davinci_dvevm_config"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-EXTRA_IMAGEDEPENDS += "u-boot"
-
-SERIAL_CONSOLES ?= "115200;ttyS0"
-EXTRA_IMAGECMD:jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-
-MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"
diff --git a/conf/machine/include/dra7xx.inc b/conf/machine/include/dra7xx.inc
deleted file mode 100644
index a02421d9..00000000
--- a/conf/machine/include/dra7xx.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-require conf/machine/include/omap-a15.inc
-SOC_FAMILY:append = ":dra7xx"
-
-MACHINE_FEATURES += "pci"
diff --git a/conf/machine/include/j7.inc b/conf/machine/include/j7.inc
deleted file mode 100644
index cf5f6a94..00000000
--- a/conf/machine/include/j7.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-require conf/machine/include/k3.inc
-SOC_FAMILY:append = ":j7"
-
-OPTEEMACHINE = "k3-j721e"
-OPTEEOUTPUTMACHINE = "k3"
-
-# Use default IMAGE_BOOT_FILES_LEGACY files
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "j721e j7200"
-TI_PDK_LIMIT_BOARDS = "j721e_evm j7200_evm"
-TI_PDK_LIMIT_CORES = "mpu1_0 mcu1_0 mcu1_1 mcu2_0 mcu2_1 mcu3_0 mcu3_1 c66xdsp_1 c66xdsp_2 c7x_1"
diff --git a/conf/machine/include/k2e.inc b/conf/machine/include/k2e.inc
deleted file mode 100644
index a6d58bb3..00000000
--- a/conf/machine/include/k2e.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY:append = ":k2e"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2e"
-TI_PDK_LIMIT_BOARDS = "evmK2E"
diff --git a/conf/machine/include/k2g.inc b/conf/machine/include/k2g.inc
deleted file mode 100644
index be40d9e7..00000000
--- a/conf/machine/include/k2g.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY:append = ":k2g"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2g"
-TI_PDK_LIMIT_BOARDS = "evmK2G iceK2G"
diff --git a/conf/machine/include/k2hk.inc b/conf/machine/include/k2hk.inc
deleted file mode 100644
index 456fda75..00000000
--- a/conf/machine/include/k2hk.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY:append = ":k2hk"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2h k2k"
-TI_PDK_LIMIT_BOARDS = "evmK2H evmK2K"
diff --git a/conf/machine/include/k2l.inc b/conf/machine/include/k2l.inc
deleted file mode 100644
index b6a4bc7d..00000000
--- a/conf/machine/include/k2l.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-require conf/machine/include/keystone.inc
-SOC_FAMILY:append = ":k2l"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "k2l"
-TI_PDK_LIMIT_BOARDS = "evmK2L"
diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
deleted file mode 100644
index 20ab7a9e..00000000
--- a/conf/machine/include/k3.inc
+++ /dev/null
@@ -1,51 +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 vmlinux.gz"
-
-UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-SPL_BINARY = "tispl.bin"
-UBOOT_SUFFIX = "img"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
-TFA_PLATFORM = "k3"
-TFA_BOARD = "generic"
-
-MACHINE_GUI_CLASS = "smallscreen"
-
-# Use the expected value of the ubifs filesystem's volume name in the kernel
-# and u-boot.
-UBI_VOLNAME = "rootfs"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
-
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-
-IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-
-IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
-
-WKS_FILE ?= "sdimage-2part.wks"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
-do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc
deleted file mode 100644
index 3cc79061..00000000
--- a/conf/machine/include/k3r5.inc
+++ /dev/null
@@ -1,24 +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/board/ti/am65x/README
-# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/j721e/README
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-SPL_BINARY = ""
-UBOOT_SUFFIX = "bin"
-UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
-UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
-UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
-
-PACKAGECONFIG:pn-u-boot-ti-staging = ""
-PACKAGECONFIG:pn-u-boot-ti-mainline = ""
diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
deleted file mode 100644
index 851328ac..00000000
--- a/conf/machine/include/keystone.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":keystone"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa15.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r10"
-
-KERNEL_IMAGETYPE = "zImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "bin"
-
-# Use the expected value of the ubifs filesystem's volume name in the kernel
-# and u-boot.
-UBI_VOLNAME = "rootfs"
-
-EXTRA_IMAGEDEPENDS += "u-boot"
-EXTRA_IMAGEDEPENDS += "boot-monitor"
-
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat pci dsp"
-MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
deleted file mode 100644
index 57295a85..00000000
--- a/conf/machine/include/omap-a15.inc
+++ /dev/null
@@ -1,44 +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"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPES = "zImage uImage"
-KERNEL_CLASSES += "kernel-uimage"
-
-UBOOT_ARCH = "arm"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-
-EXTRA_IMAGEDEPENDS += "virtual/bootloader"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-video-fbdev"
-
-MACHINE_GUI_CLASS = "smallscreen"
-
-# Use the expected value of the ubifs filesystem's volume name in the kernel
-# and u-boot.
-UBI_VOLNAME = "rootfs"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-do_image_wic[depends] += "u-boot:do_deploy"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
deleted file mode 100644
index 6e0d8dbc..00000000
--- a/conf/machine/include/omap3.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":omap3"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/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
-MACHINE_GUI_CLASS = "bigscreen"
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r127"
-
-KERNEL_IMAGETYPE = "zImage"
-
-# Default providers, may need to override for specific machines
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-KERNEL_DEVICETREE = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beagle-xm-ab.dtb omap3-evm.dtb omap3-evm-37xx.dtb am3517-evm.dtb"
-
-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 gpu"
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
deleted file mode 100644
index b8bd9d37..00000000
--- a/conf/machine/include/omap4.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":omap4"
-
-DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/arm/armv7a/tune-cortexa9.inc
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
-PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-video-fbdev"
-
-# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r4"
-
-KERNEL_IMAGETYPE = "zImage"
-
-UBOOT_MACHINE = "omap4_panda_config"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-EXTRA_IMAGEDEPENDS += "u-boot"
diff --git a/conf/machine/include/omapl1.inc b/conf/machine/include/omapl1.inc
deleted file mode 100644
index d0262c3f..00000000
--- a/conf/machine/include/omapl1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-require conf/machine/include/ti-soc.inc
-SOC_FAMILY:append = ":omapl1"
diff --git a/conf/machine/include/omapl137.inc b/conf/machine/include/omapl137.inc
deleted file mode 100644
index 6dd49418..00000000
--- a/conf/machine/include/omapl137.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require conf/machine/include/omapl1.inc
-SOC_FAMILY:append = ":omapl137"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "omapl137"
diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc
deleted file mode 100644
index f73517d0..00000000
--- a/conf/machine/include/omapl138.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-require conf/machine/include/omapl1.inc
-SOC_FAMILY:append = ":omapl138"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "omapl138"
diff --git a/conf/machine/include/ti-soc.inc b/conf/machine/include/ti-soc.inc
deleted file mode 100644
index 2792d2a0..00000000
--- a/conf/machine/include/ti-soc.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# This is a generic TI SOC family. It is a superset of all other SOCs
-# and platforms defined in meta-ti to allow BSP-level overrides.
-SOC_FAMILY = "ti-soc"
-KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
-require conf/machine/include/soc-family.inc
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
deleted file mode 100644
index 896328d9..00000000
--- a/conf/machine/include/ti33x.inc
+++ /dev/null
@@ -1,65 +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
-
-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
-MACHINE_GUI_CLASS = "bigscreen"
-
-# 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"
-
-KERNEL_IMAGETYPE = "zImage"
-
-KERNEL_DEVICETREE = " \
-    am335x-evm.dtb am335x-evmsk.dtb \
-    am335x-icev2.dtb \
-    am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \
-    am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \
-    am335x-boneblack.dtb am335x-boneblack-wireless.dtb \
-    am335x-sancloud-bbe.dtb \
-"
-
-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"
-
-UBOOT_ARCH = "arm"
-UBOOT_MACHINE = "am335x_evm_config"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-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"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am335x"
-TI_PDK_LIMIT_BOARDS = "evmAM335x icev2AM335x iceAMIC110 bbbAM335x skAM335x"
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
deleted file mode 100644
index 0f28cc91..00000000
--- a/conf/machine/include/ti43x.inc
+++ /dev/null
@@ -1,62 +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
-
-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
-MACHINE_GUI_CLASS = "bigscreen"
-
-# 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"
-
-KERNEL_IMAGETYPE = "zImage"
-
-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"
-
-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 += "u-boot"
-
-# List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
-
-# Set the list of device targets for ti-pdk class recipes
-TI_PDK_LIMIT_SOCS = "am437x"
-TI_PDK_LIMIT_BOARDS = "evmAM437x idkAM437x skAM437x"
-
-IMAGE_FSTYPES += "tar.xz wic.xz"
-WKS_FILE ?= "sdimage-2part.wks"
-IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX}"
-do_image_wic[depends] += "u-boot:do_deploy"