summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-04-26 15:29:58 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2019-04-26 15:29:58 +0000
commitacf9f5aaffdbbb4a4b15d4fcbda14668975e695c (patch)
treec363cb370bce574e2f65ad0c2bb3861650e42d16 /templates
parent752c944f73e693333e902530b747d6d7259caf37 (diff)
parent54e9bf9eda7d668df5d71dcc5974c22db5e3eecb (diff)
Merge "Fix imx6qdlsabreauto machine configuration"
Diffstat (limited to 'templates')
-rw-r--r--templates/machine/imx6qdlsabreauto/40_bblayers.conf.inc (renamed from templates/machine/imx6qsabreauto/40_bblayers.conf.inc)2
-rw-r--r--templates/machine/imx6qdlsabreauto/50_local.conf.inc4
-rw-r--r--templates/machine/imx6qdlsabreauto/50_setup.sh (renamed from templates/machine/imx6qsabreauto/50_setup.sh)0
-rw-r--r--templates/machine/imx6qsabreauto/50_local.conf.inc4
4 files changed, 4 insertions, 6 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
-