Merge pull request rcore-os#206 from elliott10/xly-master

Parsing kernel command line from device tree to CI test
TangulaK · Aug 13, 2021 · d6e251a · d6e251a
2 parents b515d7f + 83edc1e
commit d6e251a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Reimplement [Zircon][zircon] microkernel in safe Rust as a userspace program!
 
 ## Quick start for RISCV64
 ```
-make rv64-image
+make riscv-image
 cd zCore
 make run arch=riscv64 linux=1
 ```

diff --git a/zCore/src/main.rs b/zCore/src/main.rs
@@ -119,8 +119,18 @@ pub extern "C" fn rust_main(hartid: usize, device_tree_paddr: usize) -> ! {
         dtb: device_tree_vaddr,
     });
 
+    use alloc::{format, string::ToString};
+    use kernel_hal_bare::virtio::CMDLINE;
+    let cmdline_dt = CMDLINE.read();
+    let mut cmdline = boot_info.cmdline.to_string();
+
+    if !cmdline_dt.is_empty() {
+        cmdline = format!("{}:{}", boot_info.cmdline, cmdline_dt);
+    };
+    warn!("cmdline: {:?}", cmdline);
+
     // 正常由bootloader载入文件系统镜像到内存, 这里不用，而使用后面的virtio
-    main(&mut [], boot_info.cmdline);
+    main(&mut [], &cmdline);
 }
 
 #[cfg(feature = "linux")]