[meta-ti] [master][PATCH] beaglebone: drop check for meta-yocto-bsp collision

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys at ti.com>

Now that meta-yocto-bsp renamed reference machine to beaglebone-yocto

Signed-off-by: Denys Dmytriyenko <denys at ti.com>
---
 conf/machine/beaglebone.conf        |  1 -
 conf/machine/include/beaglebone.inc | 12 ------------
 2 files changed, 13 deletions(-)
 delete mode 100644 conf/machine/include/beaglebone.inc

diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 715d2f2..a73bf22 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -3,7 +3,6 @@
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
 
 require conf/machine/include/ti33x.inc
-require conf/machine/include/beaglebone.inc
 
 KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
 
diff --git a/conf/machine/include/beaglebone.inc b/conf/machine/include/beaglebone.inc
deleted file mode 100644
index b10146d..0000000
--- a/conf/machine/include/beaglebone.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-python () {
-    layers = d.getVar("BBFILE_COLLECTIONS", True)
-    if not layers:
-        return
-    if "yoctobsp" in layers:
-        bb.fatal("\nmeta-yocto-bsp has been detected in bblayers.conf, which provides basic reference BSP for beaglebone platform. " \
-                "\nSince meta-ti provides official comprehensive BSP for TI SoCs, including beaglebone, there could be potential conflicts " \
-                "\nbetween beaglebone machine definitions available in meta-yocto-bsp and meta-ti layers. It is recommended to remove " \
-                "\nor disable meta-yocto-bsp in bblayers.conf, when using meta-ti and building for beaglebone platform. Alternatively, " \
-                "\nit is possible to build for am335x-evm with meta-ti, which is a more generic platform for Sitara AM335x SoC and " \
-                "\nalso covers beaglebone variants.")
-}
-- 
2.7.4