updates bsp

CMakeLists.txt

@@ -4,8 +4,11 @@ endif()
 if (NOT DEFINED ISA)
 	set(ISA imc)
 endif()
+if(DEFINED LINK_TARGET)
+    set(LNK LINK_TARGET=${LINK_TARGET})
+endif()
 message(STATUS "Building firmware using ${BOARD} board configuration and isa ${ISA}")
 add_custom_target(fw-common ALL 
-	COMMAND make -C hello-world BOARD=${BOARD} ISA=${ISA} && make -C benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA} && make -C benchmarks/coremark BOARD=${BOARD} ISA=${ISA}
+	COMMAND make -C hello-world BOARD=${BOARD} ISA=${ISA} ${LNK} && make -C benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA} ${LNK} && make -C benchmarks/coremark BOARD=${BOARD} ISA=${ISA} ${LNK}
     USES_TERMINAL
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

bare-metal-bsp

@@ -1 +1 @@
-Subproject commit 87dc0ec2304adcb94a25b397a357aadae1304867
+Subproject commit f21ea46befe7401cc35205d3b64e3991504b6289

benchmarks/coremark/ee_printf.c

@@ -664,7 +664,7 @@ ee_vsprintf(char *buf, const char *fmt, va_list args)
 void
 uart_send_char(char c)
 {
-#if defined(BOARD_ehrenberg)
+#if defined(BOARD_ehrenberg) || defined(BOARD_tgc_vp)
             while (get_uart_rx_tx_reg_tx_free(uart)==0) ;
             uart_write(uart, c);
             if (c == '\n') {

benchmarks/dhrystone/Makefile

@@ -9,7 +9,7 @@ HEADERS := dhry.h
 BOARD?=iss
 LINK_TARGET=link
 RISCV_ARCH:=rv32$(ISA)
-ifeq ($(ISA),e)
+ifneq (,$(findstring e,$(ISA)))
     RISCV_ABI:=ilp32e
 else
     RISCV_ABI:=ilp32
@@ -17,7 +17,7 @@ endif
 # '-lgcc -lm' are needed to add softfloat routines
 CFLAGS  := -g -O3 -DITERATIONS=$(ITERATIONS) -DHZ=32768 -DTIME -DNO_INIT -fno-inline -fno-builtin-printf -fno-common -Wno-implicit \
  -funroll-loops -fpeel-loops -fgcse-sm -fgcse-las
-
+LDFLAGS := -Wl,--wrap=scanf
 TOOL_DIR=$(dir $(compiler))
 
 BSP_BASE = ../../bare-metal-bsp

hello-world/Makefile

@@ -1,4 +1,3 @@
-
 TARGET  = hello
 ISA?=imc