andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2024-11-24 10:26:25 +04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yifan Wu 2021-02-02 16:30:29 +08:00
parent 1ca5592f56
commit 1dd08f7eaa
2 changed files with 9 additions and 9 deletions
Show Stats 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
# BOARD
BOARD ?= qemu
SBI ?= rustsbi
BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin
BOARD ?= qemu
SBI ?= rustsbi
BOOTLOADER := ../bootloader/$(SBI)-$(BOARD).bin
# Run K210
K210-SERIALPORT = /dev/ttyUSB0
K210-BURNER = ../tools/kflash.py
K210-BURNER = ../tools/kflash.py
# Binutils
OBJDUMP := rust-objdump --arch-name=riscv64
@ -25,10 +25,10 @@ DISASM ?= -x
build: env $(KERNEL_BIN)
env:
(rustup component list | grep "rust-src") || rustup component add rust-src
(rustup component list | grep "llvm-tools-preview") || rustup component add llvm-tools-preview
(which rust-objdump) || cargo install cargo-binutils
(rustup target list | grep "riscv64gc-unknown-none-elf") || rustup target add riscv64gc-unknown-none-elf
(rustup target list | grep "riscv64gc-unknown-none-elf (installed)") || rustup target add $(TARGET)
cargo install cargo-binutils
rustup component add rust-src
rustup component add llvm-tools-preview
$(KERNEL_BIN): kernel
@$(OBJCOPY) $(KERNEL_ELF) --strip-all -O binary $@

2
rust-toolchain
View File

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