14 files changed, 4 insertions, 35 deletions
diff --git a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc
index f09144959..779006506 100644
--- a/templates/machine/imx6qsabreauto/40_bblayers.conf.inc
+++ b/templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc
@@ -2,6 +2,4 @@
 # recognized by meta-freescale/dynamic-layers
 BBLAYERS =+ "\
   ${METADIR}/meta-freescale \
-  ${METADIR}/meta-freescale-3rdparty \
-  ${METADIR}/meta-freescale-distro \
   "
diff --git a/templates/machine/imx6qdlsabreauto/50_local.conf.inc b/templates/machine/imx6qdlsabreauto/50_local.conf.inc
new file mode 100644
index 000000000..58e3c7d02
--- /dev/null
+++ b/templates/machine/imx6qdlsabreauto/50_local.conf.inc
@@ -0,0 +1,4 @@
+MACHINE = "imx6qdlsabreauto"
+#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc
+require conf/include/agl_imx6qdlsabreauto.inc
+
diff --git a/templates/machine/imx6qsabreauto/50_setup.sh b/templates/machine/imx6qdlsabreauto/50_setup.sh
index bb22790dc..bb22790dc 100644
--- a/templates/machine/imx6qsabreauto/50_setup.sh
+++ b/templates/machine/imx6qdlsabreauto/50_setup.sh
diff --git a/templates/machine/imx6qsabreauto/50_local.conf.inc b/templates/machine/imx6qsabreauto/50_local.conf.inc
deleted file mode 100644
index cbfda6a86..000000000
--- a/templates/machine/imx6qsabreauto/50_local.conf.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-MACHINE = "imx6qsabreauto"
-#see meta-agl/meta-agl-bsp/conf/include/agl_imx6qsabreauto.inc
-require conf/include/agl_imx6qsabreauto.inc
-
diff --git a/templates/machine/imx6qsabrelite/40_bblayers.conf.inc b/templates/machine/imx6qsabrelite/40_bblayers.conf.inc
deleted file mode 100644
index 2377ff6bc..000000000
--- a/templates/machine/imx6qsabrelite/40_bblayers.conf.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-freescale \
-  ${METADIR}/meta-freescale-3rdparty \
-  ${METADIR}/meta-freescale-distro \
-  ${METADIR}/meta-boundary \
-  "
diff --git a/templates/machine/imx6qsabrelite/50_local.conf.inc b/templates/machine/imx6qsabrelite/50_local.conf.inc
deleted file mode 100644
index 72700ccc7..000000000
--- a/templates/machine/imx6qsabrelite/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-MACHINE = "imx6qsabrelite"
-require conf/include/agl_imx6qsabrelite.inc
diff --git a/templates/machine/imx6qsabrelite/50_setup.sh b/templates/machine/imx6qsabrelite/50_setup.sh
deleted file mode 100644
index bb22790dc..000000000
--- a/templates/machine/imx6qsabrelite/50_setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find_and_ack_eula $METADIR/meta-freescale EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/templates/machine/joule/50_bblayers.conf.inc b/templates/machine/joule/50_bblayers.conf.inc
deleted file mode 100644
index d50ccc922..000000000
--- a/templates/machine/joule/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-intel"
diff --git a/templates/machine/joule/50_local.conf.inc b/templates/machine/joule/50_local.conf.inc
deleted file mode 100644
index 04b7e6f20..000000000
--- a/templates/machine/joule/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "intel-corei7-64"
-#see meta-agl/meta-agl-bsp/conf/include/agl_joule.inc
-require conf/include/agl_joule.inc
diff --git a/templates/machine/nitrogen6x/40_bblayers.conf.inc b/templates/machine/nitrogen6x/40_bblayers.conf.inc
deleted file mode 100644
index 2377ff6bc..000000000
--- a/templates/machine/nitrogen6x/40_bblayers.conf.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-freescale \
-  ${METADIR}/meta-freescale-3rdparty \
-  ${METADIR}/meta-freescale-distro \
-  ${METADIR}/meta-boundary \
-  "
diff --git a/templates/machine/nitrogen6x/50_local.conf.inc b/templates/machine/nitrogen6x/50_local.conf.inc
deleted file mode 100644
index e0133552d..000000000
--- a/templates/machine/nitrogen6x/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "nitrogen6x"
-require conf/include/agl_nitrogen6x.inc
-
diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh
deleted file mode 100644
index bb22790dc..000000000
--- a/templates/machine/nitrogen6x/50_setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-find_and_ack_eula $METADIR/meta-freescale EULA
-export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
diff --git a/templates/machine/raspberrypi2/50_bblayers.conf.inc b/templates/machine/raspberrypi2/50_bblayers.conf.inc
deleted file mode 100644
index 1250b359f..000000000
--- a/templates/machine/raspberrypi2/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/meta-raspberrypi"
diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc
deleted file mode 100644
index 5d314eeb4..000000000
--- a/templates/machine/raspberrypi2/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "raspberrypi2"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
-require conf/include/agl_raspberrypi2.inc