2 files changed, 19 insertions, 18 deletions
diff --git a/buildconf/bblayers.conf b/buildconf/bblayers.conf
index 66c3d39..5045368 100644
--- a/buildconf/bblayers.conf
+++ b/buildconf/bblayers.conf
@@ -5,8 +5,20 @@ LCONF_VERSION = "6"
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
 
-# These layers hold recipe metadata not found in OE-core, but lack any machine or distro content
-BASELAYERS ?= " \
+BBLAYERS ?= " \
+  ${TOPDIR}/../stuff/meta-angstrom \
+  \
+  \
+  ${TOPDIR}/../stuff/meta-toradex-nxp \
+  ${TOPDIR}/../stuff/meta-fsl-arm \
+  ${TOPDIR}/../stuff/meta-fsl-arm-extra \
+  \
+  ${TOPDIR}/../stuff/meta-toradex-tegra \
+  ${TOPDIR}/../stuff/meta-jetson-tk1 \
+  \
+  ${TOPDIR}/../stuff/meta-toradex-bsp-common \
+  \
+  \
   ${TOPDIR}/../stuff/meta-linaro/meta-linaro-toolchain \
   ${TOPDIR}/../stuff/meta-openembedded/meta-oe \
   ${TOPDIR}/../stuff/meta-openembedded/meta-efl \
@@ -20,21 +32,10 @@ BASELAYERS ?= " \
   ${TOPDIR}/../stuff/meta-openembedded/meta-python \
   ${TOPDIR}/../stuff/meta-lxde \
   ${TOPDIR}/../stuff/meta-browser \
-  ${TOPDIR}/../stuff/meta-fsl-arm \
-  ${TOPDIR}/../stuff/meta-fsl-arm-extra \
-  ${TOPDIR}/../stuff/meta-fsl-demos \
-  ${TOPDIR}/../stuff/meta-jetson-tk1 \
   ${TOPDIR}/../stuff/meta-qt5 \
-" 
-
-# These layers hold machine specific content, aka Board Support Packages
-BSPLAYERS ?= " \
-  ${TOPDIR}/../stuff/meta-toradex \
-"
-
-BBLAYERS ?= " \
-  ${TOPDIR}/../stuff/meta-angstrom \
-  ${BSPLAYERS} \
-  ${BASELAYERS}\
+  ${TOPDIR}/../stuff/meta-fsl-demos \
+  ${TOPDIR}/../stuff/meta-toradex-demos \
+  \
+  \
   ${TOPDIR}/../stuff/openembedded-core/meta \
 "
diff --git a/buildconf/export b/buildconf/export
index 2fe5531..22fc942 100644
--- a/buildconf/export
+++ b/buildconf/export
@@ -17,7 +17,7 @@ echo "    angstrom-qt-x11-image"
 
 if [ $FIRST_TIME -eq 1 ]; then
 	mkdir -p conf
-	cp ../stuff/meta-toradex/buildconf/*.conf conf/
+	cp ../stuff/meta-toradex-demos/buildconf/*.conf conf/
 
 	echo ""
 	$ECHO -e "\033[1mA sample conf/local.conf file has been created"