Merge pull request #86 from Aidan-McNay/ISA-Fix

Updated compiler target architecture
efabless · Aug 1, 2023 · bf6d5a5 · bf6d5a5
2 parents c7ef488 + ffc81d9
commit bf6d5a5
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 25 deletions.
diff --git a/firmware/blink/Makefile b/firmware/blink/Makefile
@@ -16,7 +16,7 @@ PATTERN = blink
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../start.s
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -O0 -mabi=ilp32 -march=rv32i -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -O0 -mabi=ilp32 -march=rv32i_zicsr -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D blink.elf > blink.lst
 
 %.hex: %.elf

diff --git a/firmware/blink2/Makefile b/firmware/blink2/Makefile
@@ -30,7 +30,7 @@ all:  ${PATTERN:=.hex}
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.s $(FIRMWARE_PATH)/sections.lds
-	${TOOLCHAIN_PATH}/${GCC_PREFIX}-gcc -O0 -march=rv32i -mabi=ilp32 -Wl,-Bstatic,-T,$(FIRMWARE_PATH)/sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ $<
+	${TOOLCHAIN_PATH}/${GCC_PREFIX}-gcc -O0 -march=rv32i_zicsr -mabi=ilp32 -Wl,-Bstatic,-T,$(FIRMWARE_PATH)/sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ $<
 	${TOOLCHAIN_PATH}/riscv32-unknown-elf-objdump -D blink2.elf > blink2.lst
 
 %.hex: %.elf

diff --git a/firmware/gpio_test/Makefile b/firmware/gpio_test/Makefile
@@ -10,7 +10,7 @@ PATTERN = gpio_test
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../start.s ../print_io.c ../print_io.h
-	$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
+	$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i_zicsr -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
 	${TOOLCHAIN_PATH}/riscv32-unknown-elf-objdump -D gpio_test.elf > gpio_test.lst
 
 %.hex: %.elf

diff --git a/firmware/hello/Makefile b/firmware/hello/Makefile
@@ -11,7 +11,7 @@ hex:  ${PATTERN:=.hex}
 
 #%.elf: %.c ../sections.lds ../start.s spi_io.c spi_io.h ../print_io.c ../print_io.h
 %.elf: %.c ../sections.lds ../start.s ../print_io.c ../print_io.h
-	$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
+	$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i_zicsr -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
 	${TOOLCHAIN_PATH}/riscv32-unknown-elf-objdump -D hello.elf > hello.lst
 
 %.hex: %.elf

diff --git a/firmware/io_config/Makefile b/firmware/io_config/Makefile
@@ -30,7 +30,7 @@ all:  ${PATTERN:=.hex}
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.s $(FIRMWARE_PATH)/sections.lds
-	${TOOLCHAIN_PATH}/${GCC_PREFIX}-gcc -O0 -march=rv32i -mabi=ilp32 -Wl,-Bstatic,-T,$(FIRMWARE_PATH)/sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ $<
+	${TOOLCHAIN_PATH}/${GCC_PREFIX}-gcc -O0 -march=rv32i_zicsr -mabi=ilp32 -Wl,-Bstatic,-T,$(FIRMWARE_PATH)/sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ $<
 	${TOOLCHAIN_PATH}/riscv32-unknown-elf-objdump -D io_config.elf > io_config.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/bitbang/Makefile b/firmware_vex/bitbang/Makefile
@@ -16,7 +16,7 @@ PATTERN = bitbang
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../crt0_vex.S
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D bitbang.elf > bitbang.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/blink/Makefile b/firmware_vex/blink/Makefile
@@ -17,8 +17,8 @@ PATTERN = blink
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../crt0_vex.S
-	#$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	#$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i_zicsr -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D blink.elf > blink.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/counter_proj_example/Makefile b/firmware_vex/counter_proj_example/Makefile
@@ -28,7 +28,7 @@ check: gpio_config_def.py gpio_config_io.py gpio_config_data.c
 	python3 ../gpio_config/gpio_config_checker.py
 
 %.elf: %.c ../sections.lds ../crt0_vex.S gpio_config_data.c
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc $(INCLUDES) -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc $(INCLUDES) -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D $@ > $*.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/generated/variables.mak b/firmware_vex/generated/variables.mak
@@ -4,7 +4,7 @@ LIBS=libc libcompiler_rt libbase libfatfs liblitespi liblitedram libliteeth libl
 TRIPLE=riscv64-unknown-elf
 CPU=vexriscv
 CPUFAMILY=riscv
-CPUFLAGS=-march=rv32i      -mabi=ilp32 -D__vexriscv__
+CPUFLAGS=-march=rv32i_zicsr      -mabi=ilp32 -D__vexriscv__
 CPUENDIANNESS=little
 CLANG=0
 CPU_DIRECTORY=/Users/jeffdi/Projects/caravel_mgmt_soc_litex/venv/lib/python3.9/site-packages/litex/soc/cores/cpu/vexriscv

diff --git a/firmware_vex/gpio_test/Makefile b/firmware_vex/gpio_test/Makefile
@@ -30,7 +30,7 @@ check: gpio_config_def.py gpio_config_io.py gpio_config_data.c
 	python3 ../gpio_config/gpio_config_checker.py
 
 %.elf: %.c ../sections.lds ../crt0_vex.S gpio_config_data.c
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc $(INCLUDES) -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc $(INCLUDES) -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D $@ > $*.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/io_config/Makefile b/firmware_vex/io_config/Makefile
@@ -16,7 +16,7 @@ PATTERN = io_config
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../crt0_vex.S
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D io_config.elf > io_config.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/matt_test/Makefile b/firmware_vex/matt_test/Makefile
@@ -27,7 +27,7 @@ check: gpio_config_def.py gpio_config_io.py gpio_config_data.c
 	python3 ../gpio_config/gpio_config_checker.py
 
 %.elf: %.c ../sections.lds ../crt0_vex.S gpio_config_data.c
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc $(INCLUDES) -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc $(INCLUDES) -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D $@ > $*.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/mprj_no_bitbang/Makefile b/firmware_vex/mprj_no_bitbang/Makefile
@@ -16,7 +16,7 @@ PATTERN = mprj_no_bitbang
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../crt0_vex.S
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-unknown-elf-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-unknown-elf-objdump -D mprj_no_bitbang.elf > mprj_no_bitbang.lst
 
 %.hex: %.elf

diff --git a/firmware_vex/nucleo/Makefile b/firmware_vex/nucleo/Makefile
@@ -163,9 +163,9 @@ hex:  ${PATTERN:=.hex}
 #	python3 ../gpio_config/gpio_config_builder.py
 
 %.elf: %.c ../sections.lds ../crt0_vex.S ./gpio_config_data.c ./send_packet.c
-	#$(TOOLCHAIN_PATH)riscv32-unknown-linux-gnu-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c ../gpio_program.c $<
+	#$(TOOLCHAIN_PATH)riscv32-unknown-linux-gnu-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c ../gpio_program.c $<
 
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-objdump -s  config_io_o.elf > config_io_o.lst
 
 %.hex: %.elf

diff --git a/gf180/blink/Makefile b/gf180/blink/Makefile
@@ -18,9 +18,9 @@ PATTERN = blink
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../crt0_vex.S
-	#$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
-	#$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c ../stub.c $<
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
+	#$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i_zicsr -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
+	#$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c ../stub.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-objdump -D blink.elf > blink.lst
 
 %.hex: %.elf

diff --git a/gf180/generated/variables.mak b/gf180/generated/variables.mak
@@ -4,7 +4,7 @@ LIBS=libc libcompiler_rt libbase libfatfs liblitespi liblitedram libliteeth libl
 TRIPLE=riscv64-unknown-elf
 CPU=vexriscv
 CPUFAMILY=riscv
-CPUFLAGS=-march=rv32i      -mabi=ilp32 -D__vexriscv__
+CPUFLAGS=-march=rv32i_zicsr      -mabi=ilp32 -D__vexriscv__
 CPUENDIANNESS=little
 CLANG=0
 CPU_DIRECTORY=/Users/jeffdi/Projects/caravel_mgmt_soc_litex/venv/lib/python3.9/site-packages/litex/soc/cores/cpu/vexriscv

diff --git a/notebooks/openmpw-bringup-template.ipynb b/notebooks/openmpw-bringup-template.ipynb
@@ -420,7 +420,7 @@
       "stream_h   = 111000000000111100000000011110000000001111000000000111100000000011110000000001111000000000111100000000011110000000001111000000000111100000000011110000000001111000000000111100000000011110000000001111000000000111100000000011100000000011100000000001\n",
       "stream_l   = 000000111100000000111110000000011111000000001111100000000111110000000011111000000001111100000000111110000000011111000000001111100000000111100000000111100000000011100000000011100000000011100000000011100000000011100000000011100000000001100000000001\n",
       "n_bits = 247\n",
-      "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-gcc -I/home/proppy/src/github.com/efabless/caravel_board/firmware_vex/gpio_test -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o gpio_test.elf ../crt0_vex.S ../isr.c gpio_test.c\n",
+      "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-gcc -I/home/proppy/src/github.com/efabless/caravel_board/firmware_vex/gpio_test -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o gpio_test.elf ../crt0_vex.S ../isr.c gpio_test.c\n",
       "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-objdump -D gpio_test.elf > gpio_test.lst\n",
       "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-objcopy -O verilog gpio_test.elf gpio_test.hex\n",
       "sed -i.orig -e 's/@1000/@0000/g' gpio_test.hex\n",
@@ -643,7 +643,7 @@
       "stream_h   = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011100000000011100000000011100000000001\n",
       "stream_l   = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111100000000111100000000111100000000011100000000011100000000011100000000011100000000011100000000011100000000000000000000000\n",
       "n_bits = 247\n",
-      "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-gcc -I/home/proppy/src/github.com/efabless/caravel_board/firmware_vex/gpio_test -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o gpio_test.elf ../crt0_vex.S ../isr.c gpio_test.c\n",
+      "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-gcc -I/home/proppy/src/github.com/efabless/caravel_board/firmware_vex/gpio_test -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o gpio_test.elf ../crt0_vex.S ../isr.c gpio_test.c\n",
       "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-objdump -D gpio_test.elf > gpio_test.lst\n",
       "xpack-riscv-none-elf-gcc-11.3.0-1/bin/riscv-none-elf-objcopy -O verilog gpio_test.elf gpio_test.hex\n",
       "sed -i.orig -e 's/@1000/@0000/g' gpio_test.hex\n",

diff --git a/stanford/blink/Makefile b/stanford/blink/Makefile
@@ -18,8 +18,8 @@ PATTERN = blink
 hex:  ${PATTERN:=.hex}
 
 %.elf: %.c ../sections.lds ../crt0_vex.S
-	#$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
-	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c ../stub.c $<
+	#$(TOOLCHAIN_PATH)riscv32-unknown-elf-gcc -O0 -march=rv32i_zicsr -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../start.s ../print_io.c $<
+	$(TOOLCHAIN_PATH)$(TOOLCHAIN_PREFIX)-gcc -I../ -I../generated/ -O0 -mabi=ilp32 -march=rv32i_zicsr -D__vexriscv__ -Wl,-Bstatic,-T,../sections.lds,--strip-debug -ffreestanding -nostdlib -o $@ ../crt0_vex.S ../isr.c ../stub.c $<
 	${TOOLCHAIN_PATH}$(TOOLCHAIN_PREFIX)-objdump -D blink.elf > blink.lst
 
 %.hex: %.elf

diff --git a/stanford/generated/variables.mak b/stanford/generated/variables.mak
@@ -4,7 +4,7 @@ LIBS=libc libcompiler_rt libbase libfatfs liblitespi liblitedram libliteeth libl
 TRIPLE=riscv64-unknown-elf
 CPU=vexriscv
 CPUFAMILY=riscv
-CPUFLAGS=-march=rv32i      -mabi=ilp32 -D__vexriscv__
+CPUFLAGS=-march=rv32i_zicsr      -mabi=ilp32 -D__vexriscv__
 CPUENDIANNESS=little
 CLANG=0
 CPU_DIRECTORY=/Users/jeffdi/Projects/caravel_mgmt_soc_litex/venv/lib/python3.9/site-packages/litex/soc/cores/cpu/vexriscv