From e7039945c121b30581684fac338d48d4e15a97a4 Mon Sep 17 00:00:00 2001 From: WangRunji Date: Sun, 2 Dec 2018 19:56:20 +0800 Subject: [PATCH] move user img, remove useless files --- kernel/src/fs.rs | 2 +- tools/riscv-pk/dummy_payload/dummy_payload.ac | 0 tools/riscv-pk/dummy_payload/dummy_payload.c | 0 tools/riscv-pk/util/util.ac | 0 user/{user-aarch64.img => img/ucore-aarch64.img} | Bin 5 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 tools/riscv-pk/dummy_payload/dummy_payload.ac delete mode 100644 tools/riscv-pk/dummy_payload/dummy_payload.c delete mode 100644 tools/riscv-pk/util/util.ac rename user/{user-aarch64.img => img/ucore-aarch64.img} (100%) diff --git a/kernel/src/fs.rs b/kernel/src/fs.rs index 2e59317..f4f44fa 100644 --- a/kernel/src/fs.rs +++ b/kernel/src/fs.rs @@ -28,7 +28,7 @@ global_asm!(r#" .global _user_img_start .global _user_img_end _user_img_start: - .incbin "../user/user-aarch64.img" + .incbin "../user/img/ucore-aarch64.img" _user_img_end: "#); diff --git a/tools/riscv-pk/dummy_payload/dummy_payload.ac b/tools/riscv-pk/dummy_payload/dummy_payload.ac deleted file mode 100644 index e69de29..0000000 diff --git a/tools/riscv-pk/dummy_payload/dummy_payload.c b/tools/riscv-pk/dummy_payload/dummy_payload.c deleted file mode 100644 index e69de29..0000000 diff --git a/tools/riscv-pk/util/util.ac b/tools/riscv-pk/util/util.ac deleted file mode 100644 index e69de29..0000000 diff --git a/user/user-aarch64.img b/user/img/ucore-aarch64.img similarity index 100% rename from user/user-aarch64.img rename to user/img/ucore-aarch64.img