Map RAM Disk OK. romfs_bind: ERROR: romfs_fsconfigure failed: -22

lupyuen2 · Jul 20, 2023 · e8fa267 · e8fa267
1 parent 06e27e2
commit e8fa267
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_mm_init.c b/arch/risc-v/src/qemu-rv/qemu_rv_mm_init.c
@@ -269,6 +269,7 @@ void qemu_rv_kernel_mappings(void)
   binfo("map kernel data\n");
   map_region(KSRAM_START, KSRAM_START, KSRAM_SIZE, MMU_KDATA_FLAGS);
 
+#ifdef NOTUSED
   /* Added RAM Disk */
   //// From nuttx/boards/risc-v/litex/arty_a7/include/board_memorymap.h
   /* ramdisk (RW) */
@@ -277,6 +278,7 @@ void qemu_rv_kernel_mappings(void)
   _info("map RAM Disk\n");
   map_region((uintptr_t)__ramdisk_start, (uintptr_t)__ramdisk_start, (uintptr_t)__ramdisk_size, MMU_KDATA_FLAGS);
   _info("map RAM Disk done\n");
+#endif  // NOTUSED
 
 #ifdef CONFIG_ARCH_MMU_TYPE_SV39
 

diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knsh64/defconfig
@@ -53,6 +53,10 @@ CONFIG_DEBUG_BINFMT_INFO=y
 CONFIG_DEBUG_BINFMT_WARN=y
 CONFIG_DEBUG_ERROR=y
 CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_FS=y
+CONFIG_DEBUG_FS_ERROR=y
+CONFIG_DEBUG_FS_INFO=y
+CONFIG_DEBUG_FS_WARN=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SCHED=y

diff --git a/boards/risc-v/qemu-rv/rv-virt/scripts/ld-kernel64.script b/boards/risc-v/qemu-rv/rv-virt/scripts/ld-kernel64.script
@@ -24,7 +24,8 @@ MEMORY
     ksram (rwx) : ORIGIN = 0x80200000, LENGTH = 2048K   /* w/ cache */
     pgram (rwx) : ORIGIN = 0x80400000, LENGTH = 4096K   /* w/ cache */
     /* Added RAM Disk */
-    ramdisk (rwx) : ORIGIN = 0x84000000, LENGTH = 4096K   /* w/ cache */
+    ramdisk (rwx) : ORIGIN = 0x80800000, LENGTH = 4096K   /* w/ cache */
+    /* ramdisk (rwx) : ORIGIN = 0x84000000, LENGTH = 4096K */   /* w/ cache */
 }
 
 OUTPUT_ARCH("riscv")
@@ -37,10 +38,12 @@ __ksram_start = ORIGIN(ksram);
 __ksram_size = LENGTH(ksram);
 __ksram_end = ORIGIN(ksram) + LENGTH(ksram);
 
+/* Added RAM Disk */
 /* Page heap */
 
 __pgheap_start = ORIGIN(pgram);
-__pgheap_size = LENGTH(pgram);
+__pgheap_size = LENGTH(pgram) + LENGTH(ramdisk);
+/* Previously: __pgheap_size = LENGTH(pgram); */
 
 /* Added RAM Disk */
 /* Application ramdisk */