meta-ti/all: Merge omap-a15.inc into am57xx.inc

As am57xx.inc is now the only user of omap-a15.inc, merge the content of
omap-a15.inc into am57xx.inc and remove omap-a15.inc. As we no longer have
this common include, also remove "omap-a15" and use "am57xx" in its place.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

2 files changed, 47 insertions, 53 deletions

diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc
index c7c8029f..6acc0cb0 100644
--- a/meta-ti-bsp/conf/machine/include/am57xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
@@ -1,6 +1,50 @@
-require conf/machine/include/omap-a15.inc
+require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":am57xx"
 
-MACHINE_FEATURES += "pci"
+DEFAULTTUNE ?= "armv7athf-neon"
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw prusw-fw pruhsr-fw pruprp-fw"
+require conf/machine/include/ti-bsp.inc
+
+# Graphics providers and variables
+require conf/machine/include/mesa-pvr.inc
+PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPES = "zImage uImage"
+KERNEL_CLASSES += "kernel-uimage"
+
+UBOOT_ARCH = "arm"
+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} \
+    ${DEVICETREE_FILES} \
+"
+
+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 prueth-fw prusw-fw pruhsr-fw pruprp-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 mmip dsp gc320 pci"
+
+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} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
+do_image_wic[depends] += "virtual/bootloader:do_deploy"
+do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
deleted file mode 100644
index 8e029431..00000000
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ /dev/null
@@ -1,50 +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
-
-require conf/machine/include/ti-bsp.inc
-
-# Graphics providers and variables
-require conf/machine/include/mesa-pvr.inc
-PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
-
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPES = "zImage uImage"
-KERNEL_CLASSES += "kernel-uimage"
-
-UBOOT_ARCH = "arm"
-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} \
-    ${DEVICETREE_FILES} \
-"
-
-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 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} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
-do_image_wic[depends] += "virtual/bootloader:do_deploy"
-do_image_wic[depends] += "ti-rtos-messageq-test-fw:do_deploy"