Append CONF_PARAMS instead of overriding

chipsalliance · Nov 26, 2024 · b1e2ba8 · b1e2ba8
1 parent 0add8cc
commit b1e2ba8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/scripts/run_regression_test.sh b/.github/scripts/run_regression_test.sh
@@ -51,7 +51,7 @@ run_regression_test(){
     if [ -z "$COMMON_PARAMS" ]; then
         make -j`nproc` -C ${DIR} -f $RV_ROOT/tools/Makefile verilator TEST=${NAME} COVERAGE=${COVERAGE} 2>&1 | tee ${LOG}
     else
-        make -j`nproc` -C ${DIR} -f $RV_ROOT/tools/Makefile verilator CONF_PARAMS="${PARAMS}" TEST=${NAME} COVERAGE=${COVERAGE} 2>&1 | tee ${LOG}
+        make -j`nproc` -C ${DIR} -f $RV_ROOT/tools/Makefile verilator CONF_PARAMS+="${PARAMS}" TEST=${NAME} COVERAGE=${COVERAGE} 2>&1 | tee ${LOG}
     fi
     if [ ! -f "${DIR}/coverage.dat" ]; then
         echo -e "${COLOR_WHITE}Test '${NAME}' ${COLOR_RED}FAILED${COLOR_CLEAR}"

diff --git a/tools/Makefile b/tools/Makefile
@@ -25,7 +25,7 @@ CONF_PARAMS ?= -set build_axi4 $(USER_MODE_OPTS)
 
 TEST_CFLAGS = -g -gdwarf -O3 -funroll-all-loops
 ABI = -mabi=ilp32
-LD_ABI = $(ABI) -march=rv32imac
+LD_ABI = $(ABI) -march=rv32imc
 
 # Check for RV_ROOT
 ifeq (,$(wildcard ${RV_ROOT}/configs/veer.config))
@@ -99,6 +99,8 @@ endif
 
 OFILES = $(TEST).o
 
+debug=true
+
 ifdef debug
  DEBUG_PLUS = +dumpon
  IRUN_DEBUG = -access +rc

diff --git a/tools/picolibc.mk b/tools/picolibc.mk
@@ -43,7 +43,7 @@ $(INSTALL_PATH)/picolibc.specs: $(BUILD_PATH)/cross.txt | $(BUILD_PATH)
 
 	cd $(PICOLIBC_PATH) && meson $(BUILD_PATH) \
 		-Dmultilib=true \
-		-Dmultilib-list=rv32imac/ilp32 \
+		-Dmultilib-list=rv32imc/ilp32 \
 		-Dpicocrt=false \
 		-Datomic-ungetc=false \
 		-Dthread-local-storage=false \