From b5a3e4aea55915b941625e9506db6159c905deaa Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Sat, 5 Jun 2021 01:49:46 -0500
Subject: [PATCH] Drop RTEMS-gen68360, RTEMS-mcp750 and RTEMS-mvme167

---
 configure/CONFIG_SITE                     | 15 +++++++--------
 configure/os/CONFIG.Common.RTEMS-gen68360 | 10 ----------
 configure/os/CONFIG.Common.RTEMS-mcp750   | 10 ----------
 configure/os/CONFIG.Common.RTEMS-mvme167  | 10 ----------
 configure/os/CONFIG_SITE.linux-x86.Common |  6 ++----
 5 files changed, 9 insertions(+), 42 deletions(-)
 delete mode 100644 configure/os/CONFIG.Common.RTEMS-gen68360
 delete mode 100644 configure/os/CONFIG.Common.RTEMS-mcp750
 delete mode 100644 configure/os/CONFIG.Common.RTEMS-mvme167

diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index a0a2d0959..03ec6d114 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -78,19 +78,18 @@
 #       vxWorks-mpc8548
 #       RTEMS-beagleboneblack
 #       RTEMS-beatnik
-#       RTEMS-gen68360
-#       RTEMS-mcp750
-#       RTEMS-mvme167
 #       RTEMS-mvme2100
 #       RTEMS-mvme2700
 #       RTEMS-mvme3100
 #       RTEMS-mvme5500
-#       RTEMS-pc386
-#	RTEMS-pc686
-#	RTEMS-qoriq_e500
+#       RTEMS-pc386             (RTEMS 4)
+#       RTEMS-pc386-qemu        (RTEMS 4)
+#       RTEMS-pc686             (RTEMS 5)
+#       RTEMS-pc686-qemu        (RTEMS 5)
+#       RTEMS-qoriq_e500
 #       RTEMS-uC5282
-#	RTEMS-xilinx-zynq_a9_qemu
-#	RTEMS-xilinx_zynq_zedboad
+#       RTEMS-xilinx-zynq-a9_qemu
+#       RTEMS-xilinx_zynq_zedboard
 #       win32-x86-mingw         (linux-x86 or -x86_64 host)
 #
 
diff --git a/configure/os/CONFIG.Common.RTEMS-gen68360 b/configure/os/CONFIG.Common.RTEMS-gen68360
deleted file mode 100644
index 0a8a6e85e..000000000
--- a/configure/os/CONFIG.Common.RTEMS-gen68360
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Author: W. Eric Norum
-#         Canadian Light Source
-#         eric@cls.usask.ca
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = gen68360
-RTEMS_TARGET_CPU = m68k
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-mcp750 b/configure/os/CONFIG.Common.RTEMS-mcp750
deleted file mode 100644
index 035e6eb36..000000000
--- a/configure/os/CONFIG.Common.RTEMS-mcp750
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Author: W. Eric Norum
-#         Canadian Light Source
-#         eric@cls.usask.ca
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = mcp750
-RTEMS_TARGET_CPU = ppc
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-mvme167 b/configure/os/CONFIG.Common.RTEMS-mvme167
deleted file mode 100644
index 3651f966f..000000000
--- a/configure/os/CONFIG.Common.RTEMS-mvme167
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Author: W. Eric Norum
-#         Canadian Light Source
-#         eric@cls.usask.ca
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = mvme167
-RTEMS_TARGET_CPU = m68k
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common
index dc29e8f0d..afb74e914 100644
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -3,7 +3,5 @@
 # Site override definitions for linux-x86 host builds
 #-------------------------------------------------------
 
-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386-qemu