From 59b4378348ab439cc73ee89360c6c3782ff555bd Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 8 Dec 2020 19:25:33 -0800
Subject: [PATCH] mkplatformfs.sh.in: Drop support for obsolete platforms

---
 Makefile           |  4 ++--
 lib.sh.in          |  4 ----
 mkimage.sh.in      |  5 +----
 mkplatformfs.sh.in | 11 ++++-------
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index d14e95a..f66e15f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ SCRIPTS += $(SHIN:.sh.in=.sh)
 DATECODE=$(shell date "+%Y%m%d")
 SHELL=/bin/bash
 
-T_PLATFORMS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} usbarmory{,-musl} GCP{,-musl}
+T_PLATFORMS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} GCP{,-musl}
 T_ARCHS=i686 x86_64{,-musl} armv{6,7}l{,-musl} aarch64{,-musl}
 
-T_SBC_IMGS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl} usbarmory{,-musl}
+T_SBC_IMGS=rpi{,2,3}{,-musl} beaglebone{,-musl} cubieboard2{,-musl} odroid-c2{,-musl}
 T_CLOUD_IMGS=GCP{,-musl}
 
 T_PXE_ARCHS=x86_64{,-musl}
diff --git a/lib.sh.in b/lib.sh.in
index 7421b13..636d22c 100644
--- a/lib.sh.in
+++ b/lib.sh.in
@@ -262,14 +262,11 @@ set_target_arch_from_platform() {
         bananapi*) XBPS_TARGET_ARCH="armv7l";;
         beaglebone*) XBPS_TARGET_ARCH="armv7l";;
         cubieboard2*|cubietruck*) XBPS_TARGET_ARCH="armv7l";;
-        dockstar*) XBPS_TARGET_ARCH="armv5tel";;
-        pogoplugv4*) XBPS_TARGET_ARCH="armv5tel" ;;
         odroid-u2*) XBPS_TARGET_ARCH="armv7l";;
         odroid-c2*) XBPS_TARGET_ARCH="aarch64";;
         rpi3*) XBPS_TARGET_ARCH="aarch64";;
         rpi2*) XBPS_TARGET_ARCH="armv7l";;
         rpi*) XBPS_TARGET_ARCH="armv6l";;
-        usbarmory*) XBPS_TARGET_ARCH="armv7l";;
         ci20*) XBPS_TARGET_ARCH="mipsel";;
         i686*) XBPS_TARGET_ARCH="i686";;
         x86_64*) XBPS_TARGET_ARCH="x86_64";;
@@ -287,7 +284,6 @@ set_dracut_args_from_platform() {
     # In rare cases it is necessary to set platform specific dracut
     # args.  This is mostly the case on ARM platforms.
     case "$PLATFORM" in
-        pogoplugv4*) dracut_args="-o 'btrfs drm i18n resume terminfo'" ;;
         *) ;;
     esac
 }
diff --git a/mkimage.sh.in b/mkimage.sh.in
index a995728..99c6cd8 100644
--- a/mkimage.sh.in
+++ b/mkimage.sh.in
@@ -143,7 +143,7 @@ fi
 
 # Be absolutely certain the platform is supported before continuing
 case "$PLATFORM" in
-    bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|usbarmory|GCP|pinebookpro|*-musl);;
+    bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|GCP|pinebookpro|*-musl);;
     *) die "The $PLATFORM is not supported, exiting..."
 esac
 
@@ -286,9 +286,6 @@ odroid-u2*)
     dd if="${ROOTFS}/boot/u-boot.bin" of="${LOOPDEV}" seek=63 >/dev/null 2>&1
     dd if="${ROOTFS}/boot/E4412_S.tzsw.signed.bin" of="${LOOPDEV}" seek=2111 >/dev/null 2>&1
     ;;
-usbarmory*)
-    dd if="${ROOTFS}/boot/u-boot.imx" of="${LOOPDEV}" bs=512 seek=2 conv=fsync >/dev/null 2>&1
-    ;;
 ci20*)
     dd if="${ROOTFS}/boot/u-boot-spl.bin" of="${LOOPDEV}" obs=512 seek=1 >/dev/null 2>&1
     dd if="${ROOTFS}/boot/u-boot.img" of="${LOOPDEV}" obs=1K seek=14 >/dev/null 2>&1
diff --git a/mkplatformfs.sh.in b/mkplatformfs.sh.in
index b793a3a..681fb71 100644
--- a/mkplatformfs.sh.in
+++ b/mkplatformfs.sh.in
@@ -48,10 +48,10 @@ usage() {
     cat <<_EOF
 Usage: $PROGNAME [options] <platform> <base-tarball>
 
-Supported platforms: i686, x86_64, GCP,
-                     dockstar, bananapi, beaglebone, cubieboard2, cubietruck,
-                     odroid-c2, odroid-u2, rpi, rpi2 (armv7), rpi3 (aarch64),
-                     usbarmory, ci20, pogoplugv4, pinebookpro
+Supported platforms: i686, x86_64, GCP, bananapi, beaglebone,
+                     cubieboard2, cubietruck, odroid-c2, odroid-u2,
+                     rpi, rpi2 (armv7), rpi3 (aarch64), ci20,
+                     pinebookpro
 
 Options
     -b <syspkg> Set an alternative base-system package (defaults to base-system)
@@ -115,14 +115,11 @@ case "$PLATFORM" in
     bananapi*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     beaglebone*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     cubieboard2*|cubietruck*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
-    dockstar*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     odroid-u2*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     odroid-c2*) PKGS="$BASEPKG ${PLATFORM%-musl}-base" ;;
     rpi3*) PKGS="$BASEPKG rpi-base" ;;
     rpi2*) PKGS="$BASEPKG rpi-base" ;;
     rpi*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
-    pogo*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
-    usbarmory*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     ci20*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     i686*) PKGS="$BASEPKG" ;;
     x86_64*) PKGS="$BASEPKG" ;;