From: drahn <drahn@openbsd.org>
Date: Fri, 14 May 2021 03:01:24 +0000 (+0000)
Subject: Enable riscv64 native kernel builds.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=39b1a8c42d3a84d71f6b2d0a22b7bd0f04c051df;p=openbsd

Enable riscv64 native kernel builds.
remove extra targets
---

diff --git a/sys/arch/riscv64/conf/Makefile.riscv64 b/sys/arch/riscv64/conf/Makefile.riscv64
index 245f1441156..c8aa7ebc8b2 100644
--- a/sys/arch/riscv64/conf/Makefile.riscv64
+++ b/sys/arch/riscv64/conf/Makefile.riscv64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.riscv64,v 1.6 2021/05/12 01:20:52 jsg Exp $
+#	$OpenBSD: Makefile.riscv64,v 1.7 2021/05/14 03:01:24 drahn Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -11,7 +11,7 @@
 .include <bsd.own.mk>
 
 SIZE?=	size
-STRIP?=	llvm-strip
+STRIP?=	strip
 
 # source tree is located via $S relative to the compilation directory
 .ifndef S
@@ -28,8 +28,8 @@ CWARNFLAGS=	-Werror -Wall -Wimplicit-function-declaration \
 		-Wno-constant-conversion -Wno-address-of-packed-member \
 		-Wframe-larger-than=2047
 
-CMACHFLAGS=	--target=riscv64-unknown-openbsd6.6 -march=rv64gc \
-		-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -mno-relax \
+CMACHFLAGS=	--target=riscv64-unknown-openbsd -march=rv64gc \
+		-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer \
 		-mcmodel=medany
 CMACHFLAGS+=	-ffreestanding ${NOPIE_FLAGS}
 SORTR=		sort -R
@@ -173,15 +173,4 @@ 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
-	rdsetroot bsd.rd $S/../distrib/${_mach}/ramdisk/mr.fs
-
 %RULES