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>

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
deleted file mode 100644 (file)
index 8b3d80d..0000000
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maximum memory allowed to be assigned
-GPU_MEM = "256"
-
-# Add CMA to the kernel arguments for SOTA
-OSTREE_KERNEL_ARGS_sota_append = " cma=256M"
-
-#MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2"
-
-# use u-boot always
-RPI_USE_U_BOOT = "1"
-
-# Use UART for serial console
-ENABLE_UART ?= "1"
-
-#RPI_KERNEL_DEVICETREE_remove_raspberrypi3 = "bcm2708-rpi-0-w.dtb"
-#RPI_KERNEL_DEVICETREE_OVERLAYS_remove_raspberrypi3 = "overlays/lirc-rpi.dtbo"
-#RPI_KERNEL_DEVICETREE_OVERLAYS_append_raspberrypi3 = " overlays/vc4-fkms-v3d.dtbo"
-
-MACHINE_FEATURES += "vc4graphics"
-
-# For libomxil
-#LICENSE_FLAGS_WHITELIST = "commercial"
-
-IMAGE_INSTALL_append = " kernel-modules linux-firmware-rpidistro-bcm43430 linux-firmware-rpidistro-bcm43455 create-combined-dtb "
-
-# Psplash causes crash on first boot on RPi
-IMAGE_FEATURES_remove = "splash"
-
-# Build updatable image. Only takes effect when sota.bbclass is inherited
-DISTRO_FEATURES_append = " sota"

diff --git a/templates/feature/agl-sota/50_setup.sh b/templates/feature/agl-sota/50_setup.sh
index f209b94..76cb016 100644 (file)
--- 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 (file)
index 2e677dd..0000000
--- 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 (file)
index e476371..0000000
--- 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 (file)
index be5c9bb..0000000
--- 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 e5556f2..e12f4a4 100644 (file)
--- 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