From f64af244cccacbb7a4751f6fb7572c040d06db53 Mon Sep 17 00:00:00 2001
From: Mihail Grigorov <michael.grigorov@konsulko.com>
Date: Fri, 13 Oct 2017 10:40:09 +0300
Subject: meta-agl-bsp: imx6: Update the imx6qsabrelite machine template

* Add include/agl_imx6qsabrelite.inc
* Change the FSL layer from meta-fsl-* to meta-freescale-*
* Rename 50_bblayers.conf.inc to 40_bblayers.conf.inc

Bug-AGL: SPEC-905

Change-Id: I29563fa7bc25240018383fba2b30e2171366282a
Signed-off-by: Mihail Grigorov <michael.grigorov@konsulko.com>
Signed-off-by: Georgi Vlaev <georgi.vlaev@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11307
Reviewed-by: Leon Anavi <leon.anavi@konsulko.com>
Reviewed-by: Thomas Rini <trini@konsulko.com>
Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---
 templates/machine/imx6qsabrelite/40_bblayers.conf.inc | 5 +++++
 templates/machine/imx6qsabrelite/50_bblayers.conf.inc | 4 ----
 templates/machine/imx6qsabrelite/50_local.conf.inc    | 2 +-
 templates/machine/imx6qsabrelite/50_setup.sh          | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 templates/machine/imx6qsabrelite/40_bblayers.conf.inc
 delete mode 100644 templates/machine/imx6qsabrelite/50_bblayers.conf.inc

(limited to 'templates')

diff --git a/templates/machine/imx6qsabrelite/40_bblayers.conf.inc b/templates/machine/imx6qsabrelite/40_bblayers.conf.inc
new file mode 100644
index 000000000..8adb0b9e5
--- /dev/null
+++ b/templates/machine/imx6qsabrelite/40_bblayers.conf.inc
@@ -0,0 +1,5 @@
+BBLAYERS =+ "\
+  ${METADIR}/meta-freescale \
+  ${METADIR}/meta-freescale-3rdparty \
+  ${METADIR}/meta-freescale-distro \
+  "
diff --git a/templates/machine/imx6qsabrelite/50_bblayers.conf.inc b/templates/machine/imx6qsabrelite/50_bblayers.conf.inc
deleted file mode 100644
index 0198eb464..000000000
--- a/templates/machine/imx6qsabrelite/50_bblayers.conf.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-BBLAYERS =+ "\
-  ${METADIR}/meta-fsl-arm \
-  ${METADIR}/meta-fsl-arm-extra \
-  "
diff --git a/templates/machine/imx6qsabrelite/50_local.conf.inc b/templates/machine/imx6qsabrelite/50_local.conf.inc
index 83754d860..72700ccc7 100644
--- a/templates/machine/imx6qsabrelite/50_local.conf.inc
+++ b/templates/machine/imx6qsabrelite/50_local.conf.inc
@@ -1,2 +1,2 @@
 MACHINE = "imx6qsabrelite"
-
+require conf/include/agl_imx6qsabrelite.inc
diff --git a/templates/machine/imx6qsabrelite/50_setup.sh b/templates/machine/imx6qsabrelite/50_setup.sh
index ea340a763..bb22790dc 100644
--- a/templates/machine/imx6qsabrelite/50_setup.sh
+++ b/templates/machine/imx6qsabrelite/50_setup.sh
@@ -1,2 +1,2 @@
-find_and_ack_eula $METADIR/meta-fsl-arm EULA
+find_and_ack_eula $METADIR/meta-freescale EULA
 export EULA_FLAG_NAME="ACCEPT_FSL_EULA"
-- 
cgit 1.2.3-korg