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:04:35 +08:00
commit 2e6b6e3c86
5 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
bootloader/rustsbi-k210.bin
View file

Binary file not shown.

BIN
bootloader/rustsbi-qemu.bin
View file

Binary file not shown.

15
os/Makefile
View file

@ -10,13 +10,13 @@ SDCARD := /dev/sdb
APPS := ../user/src/bin APPS := ../user/src/bin
# 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
@ -28,10 +28,17 @@ DISASM ?= -x
build: env $(KERNEL_BIN) $(FS_IMG) build: env $(KERNEL_BIN) $(FS_IMG)
env: env:
<<<<<<< HEAD
(rustup component list | grep "rust-src") || rustup component add rust-src (rustup component list | grep "rust-src") || rustup component add rust-src
(rustup component list | grep "llvm-tools-preview") || rustup component add llvm-tools-preview (rustup component list | grep "llvm-tools-preview") || rustup component add llvm-tools-preview
(which rust-objdump) || cargo install cargo-binutils (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") || 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
>>>>>>> dev
sdcard: $(FS_IMG) sdcard: $(FS_IMG)
@echo "Are you sure write to $(SDCARD) ? [y/N] " && read ans && [ $${ans:-N} = y ] @echo "Are you sure write to $(SDCARD) ? [y/N] " && read ans && [ $${ans:-N} = y ]

2
os/src/mm/mod.rs
View file

@ -23,5 +23,5 @@ pub use memory_set::remap_test;
pub fn init() { pub fn init() {
heap_allocator::init_heap(); heap_allocator::init_heap();
frame_allocator::init_frame_allocator(); frame_allocator::init_frame_allocator();
KERNEL_SPACE.clone().lock().activate(); KERNEL_SPACE.lock().activate();
} }

2
rust-toolchain
View file

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