summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2018-02-06 07:43:35 +0000
committerDenys Dmytriyenko <denys@ti.com>2018-02-06 18:03:41 -0500
commit514f3ac674b40af05835d731beca233ad9ae1d45 (patch)
tree265d379019fdd2512dabbc76b4f684408cf8e7cf
parent9241725cc06eb4657115df7caa52312d46329395 (diff)
downloadmeta-ti-514f3ac674b40af05835d731beca233ad9ae1d45.tar.gz
beaglebone: drop check for meta-yocto-bsp collision
Now that meta-yocto-bsp renamed reference machine to beaglebone-yocto Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--conf/machine/beaglebone.conf1
-rw-r--r--conf/machine/include/beaglebone.inc12
2 files changed, 0 insertions, 13 deletions
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 715d2f21..a73bf224 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -3,7 +3,6 @@
3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
4 4
5require conf/machine/include/ti33x.inc 5require conf/machine/include/ti33x.inc
6require conf/machine/include/beaglebone.inc
7 6
8KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb" 7KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
9 8
diff --git a/conf/machine/include/beaglebone.inc b/conf/machine/include/beaglebone.inc
deleted file mode 100644
index b10146d1..00000000
--- a/conf/machine/include/beaglebone.inc
+++ /dev/null
@@ -1,12 +0,0 @@
1python () {
2 layers = d.getVar("BBFILE_COLLECTIONS", True)
3 if not layers:
4 return
5 if "yoctobsp" in layers:
6 bb.fatal("\nmeta-yocto-bsp has been detected in bblayers.conf, which provides basic reference BSP for beaglebone platform. " \
7 "\nSince meta-ti provides official comprehensive BSP for TI SoCs, including beaglebone, there could be potential conflicts " \
8 "\nbetween beaglebone machine definitions available in meta-yocto-bsp and meta-ti layers. It is recommended to remove " \
9 "\nor disable meta-yocto-bsp in bblayers.conf, when using meta-ti and building for beaglebone platform. Alternatively, " \
10 "\nit is possible to build for am335x-evm with meta-ti, which is a more generic platform for Sitara AM335x SoC and " \
11 "\nalso covers beaglebone variants.")
12}