Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update os/Makefile && Update rust to 2021-01-30

Browse source
This commit is contained in:
Yifan Wu 2021-02-02 17:44:45 +08:00
parent 05fd1c8f85
commit ca9bc70781
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
os/Makefile
View file

@ -7,13 +7,13 @@ KERNEL_ENTRY_PA := 0x80020000
DISASM_TMP := target/$(TARGET)/$(MODE)/asm DISASM_TMP := target/$(TARGET)/$(MODE)/asm
# BOARD # BOARD
BOARD ?= qemu BOARD ?= qemu
SBI ?= rustsbi SBI ?= rustsbi
BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin
# Run K210 # Run K210
K210-SERIALPORT = /dev/ttyUSB0 K210-SERIALPORT = /dev/ttyUSB0
K210-BURNER = ../tools/kflash.py K210-BURNER = ../tools/kflash.py
# Binutils # Binutils
OBJDUMP := rust-objdump --arch-name=riscv64 OBJDUMP := rust-objdump --arch-name=riscv64
@ -25,10 +25,10 @@ DISASM ?= -x
build: env $(KERNEL_BIN) build: env $(KERNEL_BIN)
env: env:
(rustup component list | grep "rust-src") || rustup component add rust-src (rustup target list | grep "riscv64gc-unknown-none-elf (installed)") || rustup target add $(TARGET)
(rustup component list | grep "llvm-tools-preview") || rustup component add llvm-tools-preview cargo install cargo-binutils
(which rust-objdump) || cargo install cargo-binutils rustup component add rust-src
(rustup target list | grep "riscv64gc-unknown-none-elf") || rustup target add riscv64gc-unknown-none-elf rustup component add llvm-tools-preview
$(KERNEL_BIN): kernel $(KERNEL_BIN): kernel
@$(OBJCOPY) $(KERNEL_ELF) --strip-all -O binary $@ @$(OBJCOPY) $(KERNEL_ELF) --strip-all -O binary $@

2
rust-toolchain
View file

@ -1 +1 @@
nightly nightly-2021-01-30