2 files changed, 13 insertions, 0 deletions

diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index bf3d91e6..e1685601 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
 
 require conf/machine/include/ti33x.inc
+require conf/machine/include/beaglebone.inc
 
 # Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"
diff --git a/conf/machine/include/beaglebone.inc b/conf/machine/include/beaglebone.inc
new file mode 100644
index 00000000..f76ad3d9
--- /dev/null
+++ b/conf/machine/include/beaglebone.inc
@@ -0,0 +1,12 @@
+python () {
+    layers = bb.data.getVar("BBFILE_COLLECTIONS", d, 1)
+    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.")
+}