aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-06-12 17:22:13 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-06-16 08:23:23 +0000
commit63a4f7d56af11891aa8ce6a2d0171e3727aaa7be (patch)
tree15cb79beed4fc569059a5c2beb4cffdf05b666b5 /templates
parent042f81bc917fe0d1b13b3fb4a48806ea91a1ef32 (diff)
Remove Raspberry Pi 3 support
The raspberrypi3 machine template had only been retained to allow anyone interested in using one with a telematics or cluster demo image build to do so. At this point the Pi 4 has been out long enough that that seems no longer necessary, so removing the support to avoid confusion and reduce clutter seems warranted. Bug-AGL: SPEC-3985 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ib3770ba03771aff468f94d5bf6f2910fc01f7ee0 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26429 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'templates')
-rw-r--r--templates/feature/agl-sota/50_setup.sh2
-rw-r--r--templates/machine/raspberrypi3/50_bblayers.conf.inc1
-rw-r--r--templates/machine/raspberrypi3/50_local.conf.inc3
-rw-r--r--templates/machine/raspberrypi3/README_machine_raspberrypi3.md9
-rw-r--r--templates/machine/raspberrypi4/50_local.conf.inc2
5 files changed, 2 insertions, 15 deletions
diff --git a/templates/feature/agl-sota/50_setup.sh b/templates/feature/agl-sota/50_setup.sh
index f209b9442..76cb016f2 100644
--- a/templates/feature/agl-sota/50_setup.sh
+++ b/templates/feature/agl-sota/50_setup.sh
@@ -10,7 +10,7 @@ EOF
case ${MACHINE} in
"qemux86-64")
echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-qemux86-64\"" >> ${BUILDDIR}/conf/bblayers.conf;;
- "raspberrypi3" | "raspberrypi4")
+ "raspberrypi4")
echo "BBLAYERS =+ \"\${METADIR}/external/meta-updater-raspberrypi\"" >> ${BUILDDIR}/conf/bblayers.conf;;
*)
echo "#No extra SOTA feature layer for MACHINE ${MACHINE}" >> ${BUILDDIR}/conf/bblayers.conf;;
diff --git a/templates/machine/raspberrypi3/50_bblayers.conf.inc b/templates/machine/raspberrypi3/50_bblayers.conf.inc
deleted file mode 100644
index 2e677dd8a..000000000
--- a/templates/machine/raspberrypi3/50_bblayers.conf.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS =+ "${METADIR}/bsp/meta-raspberrypi"
diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc
deleted file mode 100644
index e47637178..000000000
--- a/templates/machine/raspberrypi3/50_local.conf.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-MACHINE = "raspberrypi3"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
-require conf/include/agl_raspberrypi3.inc
diff --git a/templates/machine/raspberrypi3/README_machine_raspberrypi3.md b/templates/machine/raspberrypi3/README_machine_raspberrypi3.md
deleted file mode 100644
index be5c9bb59..000000000
--- a/templates/machine/raspberrypi3/README_machine_raspberrypi3.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Machine raspberrypi3
-authors: Anton Gerasimov <anton@advancedtelematic.com>, Jan-Simon Möller <jsmoeller@linuxfoundation.org>, Kevin Hilman <khilman@baylibre.com>, Leon Anavi <leon.anavi@konsulko.com>, Matt Ranostay <matt.ranostay@konsulko.com>, Ronan Le Martret <ronan.lemartret@iot.bzh>, Stephane Desneux <stephane.desneux@iot.bzh>, Tom Rini <trini@konsulko.com>
----
-
-### Machine raspberrypi3
-
-*Description is missing - please complete file meta-agl/templates/machine/raspberrypi3/README_machine_raspberrypi3.md*
-
diff --git a/templates/machine/raspberrypi4/50_local.conf.inc b/templates/machine/raspberrypi4/50_local.conf.inc
index e5556f278..e12f4a4a3 100644
--- a/templates/machine/raspberrypi4/50_local.conf.inc
+++ b/templates/machine/raspberrypi4/50_local.conf.inc
@@ -1,4 +1,4 @@
MACHINE = "raspberrypi4-64"
-#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+#see meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi4.inc
require conf/include/agl_raspberrypi4.inc