summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rwxr-xr-xbsp/tools/openocd_upload.sh2
m---------openocd0
3 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d19e956..ffc2e77 100644
--- a/Makefile
+++ b/Makefile
@@ -90,15 +90,12 @@ PROGRAM_ELF = $(srcdir)/software/$(PROGRAM)/$(PROGRAM)
.PHONY: software
software:
- cd $(PROGRAM_DIR);\
- make
+ $(MAKE) -C $(PROGRAM_DIR)
software_clean:
- cd $(PROGRAM_DIR);\
- make clean
+ $(MAKE) -C $(PROGRAM_DIR) clean
dasm: software
- cd $(PROGRAM_DIR); \
$(toolchain_dest)/bin/riscv32-unknown-elf-objdump -D $(PROGRAM_ELF)
#############################################################
diff --git a/bsp/tools/openocd_upload.sh b/bsp/tools/openocd_upload.sh
index afa9dad..ecbe3b4 100755
--- a/bsp/tools/openocd_upload.sh
+++ b/bsp/tools/openocd_upload.sh
@@ -1,5 +1,5 @@
#! /bin/bash -x
openocd -f ${2} \
- -c "flash protect 0 64 last off; program ${1}; resume 0x20400000; exit" \
+ -c "flash protect 0 64 last off; program ${1} verify; resume 0x20400000; exit" \
2>&1 | tee openocd_upload.log
diff --git a/openocd b/openocd
-Subproject b474c22b33be7fa4969c0dfa9ccf172ce1bab5d
+Subproject 193f63094891cd3fe6a5032fef2c71d09f063ff