From 7ccdcc4dbfabf19a3264b673f4b2ac4a78c9fc3a Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 16 May 2021 02:01:33 +0000
Subject: [PATCH] remove unused pre efiboot targets

---
 sys/arch/arm64/conf/Makefile.arm64 | 18 +-----------------
 sys/arch/armv7/conf/Makefile.armv7 | 20 +-------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64
index 6dc9e4099d9..1f34c3c02de 100644
--- a/sys/arch/arm64/conf/Makefile.arm64
+++ b/sys/arch/arm64/conf/Makefile.arm64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.arm64,v 1.37 2021/01/28 17:39:02 deraadt Exp $
+#	$OpenBSD: Makefile.arm64,v 1.38 2021/05/16 02:01:33 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -185,20 +185,4 @@ install: update-link hardlink-obsd newinstall
 . endfor
 .endif
 
-## for qemu this is where ram is located
-RAM_ADDR?=0x40000000
-#KERNEL_LOAD_ADDR!=echo "x = hex(${KERNEL_BASE_PHYS} + ${RAM_ADDR}); print x" | python
-KERNEL_LOAD_ADDR=0x40200000
-
-# until we get native booting working, put this in the tree.
-bsdrd.umg: bsd.rd
-	mkuboot -a arm -o linux -e ${KERNEL_LOAD_ADDR} -l ${KERNEL_LOAD_ADDR} bsd.rd bsdrd.umg
-
-bsd.umg: bsd
-	mkuboot -a arm -o linux -e ${KERNEL_LOAD_ADDR} -l ${KERNEL_LOAD_ADDR} bsd bsd.umg
-
-bsd.rd: bsd
-	cp -p bsd bsd.rd
-	rdconfig bsd.rd $S/../distrib/${_mach}/ramdisk/mr.fs
-
 %RULES
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 79f89e18f9c..bba9438a561 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armv7,v 1.49 2021/01/28 17:39:02 deraadt Exp $
+#	$OpenBSD: Makefile.armv7,v 1.50 2021/05/16 02:01:33 jsg Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -167,22 +167,4 @@ install: update-link hardlink-obsd newinstall
 . endfor
 .endif
 
-# until we get native booting working, put this in the tree.
-KERNADDR_OMAP=0x80300000
-KERNADDR_IMX=0x10300000
-KERNADDR_SUNXI=0x40300000
-KERNADDR_EXYNOS=0x40300000
-KERNADDR_VEXPRESSA15=0x80300000
-KERNADDR_VEXPRESSA9=0x60300000
-
-.for SOC in IMX OMAP SUNXI EXYNOS VEXPRESSA9 VEXPRESSA15
-bsd.${SOC}.umg: bsd
-	mkuboot -a arm -o linux -e ${KERNADDR_${SOC}} -l ${KERNADDR_${SOC}} \
-	    bsd bsd.${SOC}.umg
-.endfor
-
-bsd.rd: bsd
-	cp bsd bsd.rd
-	$S/../distrib/${_mach}/ramdisk/rdsetroot < $S/../distrib/${_mach}/ramdisk/mr.fs bsd.rd
-
 %RULES
-- 
2.20.1