wip

howjmay · Oct 20, 2023 · 2521972 · 2521972
1 parent 7c4f1ca
commit 2521972
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -29,19 +29,15 @@ else # CROSS_COMPILE was set
 	endif
 
 	ARCH_CFLAGS = -march=$(processor)gcv_zba
-    SIMULATOR_FLAGS = --isa=$(processor)gcv_zba
-endif
 
-ifdef CROSS_COMPILE
-ifdef SIMULATOR
-ifeq ($(SIMULATOR),qemu)
-SIMULATOR = qemu-riscv64
-ARCH_CFLAGS += -cpu rv64,v=true,zba=true,vlen=128
-else
-SIMULATOR = spike
-PROXY_KERNEL = pk
-endif
-endif
+	ifeq ($(SIMULATOR_TYPE), qemu)
+		SIMULATOR += qemu-riscv64
+		SIMULATOR_FLAGS = -cpu $(processor),v=true,zba=true,vlen=128
+	else
+		SIMULATOR = spike
+		SIMULATOR_FLAGS = --isa=$(processor)gcv_zba
+		PROXY_KERNEL = pk
+	endif
 endif
 
 CXXFLAGS += -Wall -Wcast-qual -I. $(ARCH_CFLAGS)

diff --git a/scripts/cross-test.sh b/scripts/cross-test.sh
@@ -10,7 +10,7 @@ fi
 set -x
 
 make clean
-make CROSS_COMPILE=riscv64-unknown-elf- SIMULATOR=$1 test || exit 1 # riscv64
+make CROSS_COMPILE=riscv64-unknown-elf- SIMULATOR_TYPE=$1 test || exit 1 # riscv64
 
 # make clean
 # make CROSS_COMPILE=riscv32-unknown-elf- test || exit 1 # riscv32