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 18:00:55 +08:00
parent 513cb2055a
commit d99b71a9d5
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

@ -10,13 +10,13 @@ SDCARD := /dev/sdb
APPS := ../user/src/bin
# 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
@ -28,10 +28,10 @@ DISASM ?= -x
build: env $(KERNEL_BIN) $(FS_IMG)
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
sdcard: $(FS_IMG)
@echo "Are you sure write to $(SDCARD) ? [y/N] " && read ans && [ $${ans:-N} = y ]

2
rust-toolchain
View file

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