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

os/Makefile

@@ -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,17 @@ DISASM ?= -x
 build: env $(KERNEL_BIN) $(FS_IMG)
 
 env:
+<<<<<<< HEAD
 	(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
+>>>>>>> dev
 
 sdcard: $(FS_IMG)
 	@echo "Are you sure write to $(SDCARD) ? [y/N] " && read ans && [ $${ans:-N} = y ]

os/src/mm/mod.rs

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

rust-toolchain

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