Merge branch 'dev' into main
This commit is contained in:
commit
f091c12f65
3 changed files with 6 additions and 1454 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -6,3 +6,4 @@ os/Cargo.lock
|
|||
user/target/*
|
||||
user/.idea/*
|
||||
user/Cargo.lock
|
||||
tools/
|
||||
|
|
|
@ -78,7 +78,10 @@ disasm-vim: kernel
|
|||
@vim $(DISASM_TMP)
|
||||
@rm $(DISASM_TMP)
|
||||
|
||||
run: run-inner
|
||||
run: tools run-inner
|
||||
|
||||
tools:
|
||||
(which $(K210-BURNER)) || (cd .. && git clone https://github.com/sipeed/kflash.py.git && mv kflash.py tools)
|
||||
|
||||
run-inner: build
|
||||
ifeq ($(BOARD),qemu)
|
||||
|
@ -104,4 +107,4 @@ debug: build
|
|||
tmux split-window -h "riscv64-unknown-elf-gdb -ex 'file $(KERNEL_ELF)' -ex 'set arch riscv:rv64' -ex 'target remote localhost:1234'" && \
|
||||
tmux -2 attach-session -d
|
||||
|
||||
.PHONY: build env kernel clean disasm disasm-vim run-inner
|
||||
.PHONY: build env kernel clean disasm disasm-vim run-inner tools
|
||||
|
|
1452
tools/kflash.py
1452
tools/kflash.py
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue