From 7eda37a407e39258f09b26936cc2a6611c9f6dde Mon Sep 17 00:00:00 2001
From: Yifan Wu <shinbokuow@163.com>
Date: Sun, 3 Oct 2021 14:25:06 -0700
Subject: [PATCH] user base from 0x0->0x10000; user image size from
 128MiB->16MiB

---
 easy-fs-fuse/src/main.rs | 6 +++---
 os/Makefile              | 4 ++--
 user/src/linker.ld       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/easy-fs-fuse/src/main.rs b/easy-fs-fuse/src/main.rs
index d36d566d..cf07b618 100644
--- a/easy-fs-fuse/src/main.rs
+++ b/easy-fs-fuse/src/main.rs
@@ -56,13 +56,13 @@ fn easy_fs_pack() -> std::io::Result<()> {
             .write(true)
             .create(true)
             .open(format!("{}{}", target_path, "fs.img"))?;
-        f.set_len(128 * 2048 * 512).unwrap();
+        f.set_len(16 * 2048 * 512).unwrap();
         f
     })));
-    // 128MiB, at most 4095 files
+    // 16MiB, at most 4095 files
     let efs = EasyFileSystem::create(
         block_file.clone(),
-        128 * 2048,
+        16 * 2048,
         1,
     );
     let root_inode = Arc::new(EasyFileSystem::root_inode(&efs));
diff --git a/os/Makefile b/os/Makefile
index 07c10082..864a4e43 100644
--- a/os/Makefile
+++ b/os/Makefile
@@ -49,7 +49,7 @@ env:
 
 sdcard: fs-img
 	@echo "Are you sure write to $(SDCARD) ? [y/N] " && read ans && [ $${ans:-N} = y ]
-	@sudo dd if=/dev/zero of=$(SDCARD) bs=1048576 count=256
+	@sudo dd if=/dev/zero of=$(SDCARD) bs=1048576 count=32
 	@sudo dd if=$(FS_IMG) of=$(SDCARD)
 
 $(KERNEL_BIN): kernel
@@ -57,7 +57,7 @@ $(KERNEL_BIN): kernel
 
 fs-img: $(APPS)
 	@cd ../user && make build
-	@rm $(FS_IMG)
+	@rm $(FS_IMG) -f
 	@cd ../easy-fs-fuse && cargo run --release -- -s ../user/src/bin/ -t ../user/target/riscv64gc-unknown-none-elf/release/
 
 $(APPS):
diff --git a/user/src/linker.ld b/user/src/linker.ld
index 7273618c..02f7b6bf 100644
--- a/user/src/linker.ld
+++ b/user/src/linker.ld
@@ -2,7 +2,7 @@
 OUTPUT_ARCH(riscv)
 ENTRY(_start)
 
-BASE_ADDRESS = 0x0;
+BASE_ADDRESS = 0x10000;
 
 SECTIONS
 {
@@ -29,4 +29,4 @@ SECTIONS
         *(.eh_frame)
         *(.debug*)
     }
-}
\ No newline at end of file
+}