meta-ti/all: Make DRA7xx support a subset of AM57xx support

As AM57xx already defined both "dra7xx" and "am57xx" as SOC_FAMILY the
AM57xx was effectively a superset MACHINE. Although not all features of
AM57xx are needed for DRA7xx, make DRA7xx-EVM use the AM57xx definition.
This allows us to still support DRA7xx as the only differences that
impact device function are the selection of U-Boot defconfig, DTBs, and
OPTEE, all handled by the MACHINE conf file which is left unchanged.

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, 0 insertions, 5 deletions

diff --git a/meta-ti-bsp/conf/machine/include/am57xx.inc b/meta-ti-bsp/conf/machine/include/am57xx.inc
index 85290924..c7c8029f 100644
--- a/meta-ti-bsp/conf/machine/include/am57xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am57xx.inc
@@ -1,5 +1,4 @@
 require conf/machine/include/omap-a15.inc
-SOC_FAMILY:append = ":dra7xx"
 SOC_FAMILY:append = ":am57xx"
 
 MACHINE_FEATURES += "pci"
diff --git a/meta-ti-bsp/conf/machine/include/dra7xx.inc b/meta-ti-bsp/conf/machine/include/dra7xx.inc
deleted file mode 100644
index a02421d9..00000000
--- a/meta-ti-bsp/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"