Split bblayers in base, bsp and factory

Split the default bblayers.conf file in multiple files (that are then
included by bblayers.conf) in order to allow the user to easily select
and replace the default BSP layer list used in LMP.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>

4 files changed, 47 insertions, 37 deletions

diff --git a/conf/bblayers-base.inc b/conf/bblayers-base.inc
new file mode 100644
index 0000000..3aef790
--- /dev/null
+++ b/conf/bblayers-base.inc
@@ -0,0 +1,15 @@
+# These layers are the basic and required layers by LMP
+#
+# Only change if you really know what you are doing.
+#
+BASELAYERS = " \
+  ${OEROOT}/layers/meta-openembedded/meta-oe \
+  ${OEROOT}/layers/meta-openembedded/meta-networking \
+  ${OEROOT}/layers/meta-openembedded/meta-filesystems \
+  ${OEROOT}/layers/meta-openembedded/meta-perl \
+  ${OEROOT}/layers/meta-openembedded/meta-python \
+  ${OEROOT}/layers/meta-virtualization \
+  ${OEROOT}/layers/meta-clang \
+  ${OEROOT}/layers/meta-updater \
+  ${OEROOT}/layers/meta-security \
+"
diff --git a/conf/bblayers-bsp.inc b/conf/bblayers-bsp.inc
new file mode 100644
index 0000000..731a80b
--- /dev/null
+++ b/conf/bblayers-bsp.inc
@@ -0,0 +1,24 @@
+# These layers are all the BSP layers supported by default in LMP
+#
+# If you want to customize the default BSP layers in a factory,
+# change bblayers-factory.inc instead.
+#
+BSPLAYERS = " \
+  ${OEROOT}/layers/meta-arm/meta-arm \
+  ${OEROOT}/layers/meta-arm/meta-arm-toolchain \
+  ${OEROOT}/layers/meta-arm/meta-arm-bsp \
+  ${OEROOT}/layers/meta-freescale \
+  ${OEROOT}/layers/meta-freescale-3rdparty \
+  ${OEROOT}/layers/meta-raspberrypi \
+  ${OEROOT}/layers/meta-riscv \
+  ${OEROOT}/layers/meta-rtlwifi \
+  ${OEROOT}/layers/meta-intel \
+  ${OEROOT}/layers/meta-yocto/meta-yocto-bsp \
+  ${OEROOT}/layers/meta-xilinx/meta-xilinx-bsp \
+  ${OEROOT}/layers/meta-xilinx-tools \
+  ${OEROOT}/layers/meta-lmp/meta-lmp-bsp \
+"
+
+# Remove layer dependencies that are not used/required by LMP
+## LMP provides its own kernel recipes
+LAYERDEPENDS_meta-arm-bsp_remove = "meta-kernel"
diff --git a/conf/bblayers.conf b/conf/bblayers.conf
index dc6a793..6d390d4 100644
--- a/conf/bblayers.conf
+++ b/conf/bblayers.conf
@@ -7,48 +7,14 @@ BBPATH = "${TOPDIR}"
 
 BBFILES = ""
 
-# These layers hold recipe metadata not found in OE-core, but lack any machine or distro content
-BASELAYERS ?= " \
-  ${OEROOT}/layers/meta-openembedded/meta-oe \
-  ${OEROOT}/layers/meta-openembedded/meta-networking \
-  ${OEROOT}/layers/meta-openembedded/meta-filesystems \
-  ${OEROOT}/layers/meta-openembedded/meta-perl \
-  ${OEROOT}/layers/meta-openembedded/meta-python \
-  ${OEROOT}/layers/meta-arm/meta-arm \
-  ${OEROOT}/layers/meta-arm/meta-arm-toolchain \
-  ${OEROOT}/layers/meta-clang \
-  ${OEROOT}/layers/meta-virtualization \
-  ${OEROOT}/layers/meta-updater \
-  ${OEROOT}/layers/meta-security \
-"
-
-# These layers hold machine specific content, aka Board Support Packages
-BSPLAYERS ?= " \
-  ${OEROOT}/layers/meta-freescale \
-  ${OEROOT}/layers/meta-freescale-3rdparty \
-  ${OEROOT}/layers/meta-raspberrypi \
-  ${OEROOT}/layers/meta-riscv \
-  ${OEROOT}/layers/meta-rtlwifi \
-  ${OEROOT}/layers/meta-intel \
-  ${OEROOT}/layers/meta-yocto/meta-yocto-bsp \
-  ${OEROOT}/layers/meta-arm/meta-arm-bsp \
-  ${OEROOT}/layers/meta-xilinx/meta-xilinx-bsp \
-  ${OEROOT}/layers/meta-xilinx-tools \
-  ${OEROOT}/layers/meta-lmp/meta-lmp-bsp \
-"
-
-# Remove layer dependencies that are not used/required by LMP
-## LMP provides its own kernel recipes
-LAYERDEPENDS_meta-arm-bsp_remove = "meta-kernel"
+require bblayers-base.inc
+require bblayers-bsp.inc
 
-# Add your overlay location to EXTRALAYERS
-# Make sure to have a conf/layers.conf in there
-EXTRALAYERS ?= ""
+include bblayers-factory.inc
 
 BBLAYERS = " \
   ${OEROOT}/layers/meta-lmp/meta-lmp-base \
   ${BASELAYERS} \
   ${BSPLAYERS} \
-  ${EXTRALAYERS} \
   ${OEROOT}/layers/openembedded-core/meta \
 "
diff --git a/setup-environment-internal b/setup-environment-internal
index 51495a8..1d7f81a 100644
--- a/setup-environment-internal
+++ b/setup-environment-internal
@@ -171,6 +171,11 @@ if [ ! -e "conf/imx_hab4" ]; then
     ln -sf "${MANIFESTS}"/conf/imx_hab4 conf/keys/imx_hab4
 fi
 ln -sf "${MANIFESTS}"/conf/bblayers.conf conf/bblayers.conf
+ln -sf "${MANIFESTS}"/conf/bblayers-base.inc conf/bblayers-base.inc
+ln -sf "${MANIFESTS}"/conf/bblayers-bsp.inc conf/bblayers-bsp.inc
+if [ -f "${MANIFESTS}"/conf/bblayers-factory.inc ]; then
+    ln -sf "${MANIFESTS}"/conf/bblayers-factory.inc conf/bblayers-factory.inc
+fi
 ln -sf "${MANIFESTS}"/README.md README.md
 
 ln -sf "${MANIFESTS}" "${OEROOT}"/layers/