diff --git a/.gitmodules b/.gitmodules index b0a85f4..663f4e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "riscv-pk"] path = riscv-pk url = https://github.com/riscv-and-rust-and-decaf/riscv-pk.git +[submodule "user"] + path = user + url = https://github.com/wangrunji0408/rcore_user.git diff --git a/kernel/Makefile b/kernel/Makefile index 43d09bc..33d2fc2 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -42,12 +42,7 @@ k210_lib := ../tools/k210/libkendryte.a export ARCH = $(arch) export BOARD = $(board) export SMP = $(smp) -#export SFSIMG = $(user_dir)/build/user-$(arch).img -ifeq ($(arch), x86_64) -export SFSIMG = $(user_dir)/img/ucore-i386.img -else -export SFSIMG = $(user_dir)/img/ucore-$(arch).img -endif +export SFSIMG = $(user_dir)/build/$(arch).img ifeq ($(arch), aarch64) board := raspi3 endif diff --git a/user b/user new file mode 160000 index 0000000..86bb44b --- /dev/null +++ b/user @@ -0,0 +1 @@ +Subproject commit 86bb44b00d6af6f8fc63bc6179bc0b6cb5d3373b