Skip to content

Commit 4b6bd7d

Browse files
committed
Merge branch 'dev' into main
2 parents c01b328 + dddd04b commit 4b6bd7d

File tree

3 files changed

+6
-1454
lines changed

3 files changed

+6
-1454
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ os/Cargo.lock
66
user/target/*
77
user/.idea/*
88
user/Cargo.lock
9+
tools/

os/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ disasm-vim: kernel
7878
@vim $(DISASM_TMP)
7979
@rm $(DISASM_TMP)
8080

81-
run: run-inner
81+
run: tools run-inner
82+
83+
tools:
84+
(which $(K210-BURNER)) || (cd .. && git clone https://github.com/sipeed/kflash.py.git && mv kflash.py tools)
8285

8386
run-inner: build
8487
ifeq ($(BOARD),qemu)
@@ -104,4 +107,4 @@ debug: build
104107
tmux split-window -h "riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'" && \
105108
tmux -2 attach-session -d
106109

107-
.PHONY: build env kernel clean disasm disasm-vim run-inner
110+
.PHONY: build env kernel clean disasm disasm-vim run-inner tools

0 commit comments

Comments
 (0)