Don't change the uart at this point

Signed-off-by: Graham MacDonald <[email protected]>
hdonnay · Apr 19, 2023 · 207a8a5 · 207a8a5
1 parent f79d972
commit 207a8a5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/aarch64/src/devcons.rs b/aarch64/src/devcons.rs
@@ -4,7 +4,7 @@ use core::mem::MaybeUninit;
 use port::devcons::Console;
 use port::fdt::DeviceTree;
 
-use crate::uartpl011::Pl011Uart;
+use crate::uartmini::MiniUart;
 
 // The aarch64 devcons implementation is focussed on Raspberry Pi 3, 4 for now.
 
@@ -34,11 +34,11 @@ use crate::uartpl011::Pl011Uart;
 pub fn init(dt: &DeviceTree) {
     // Create early console because aarch64 can't use locks until MMU is set up
     Console::new_early(|| {
-        let uart = Pl011Uart::new(dt);
-        // let uart = MiniUart::new(dt);
+        // let uart = Pl011Uart::new(dt);
+        let uart = MiniUart::new(dt);
         uart.init();
 
-        static mut UART: MaybeUninit<Pl011Uart> = MaybeUninit::uninit();
+        static mut UART: MaybeUninit<MiniUart> = MaybeUninit::uninit();
         unsafe {
             UART.write(uart);
             UART.assume_init_mut()

diff --git a/aarch64/src/main.rs b/aarch64/src/main.rs
@@ -94,7 +94,7 @@ pub extern "C" fn main9(dtb_ptr: u64) {
     print_binary_sections();
 
     // Assume we've got MMU set up, so drop early console for the locking console
-    //port::devcons::drop_early_console();
+    port::devcons::drop_early_console();
 
     print_physical_memory_map();
 

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -446,13 +446,13 @@ fn run(build_params: &BuildParams) -> Result<()> {
 
             // TODO Choose UART at cmdline
             // If using UART0 (PL011), this enables serial
-            cmd.arg("-nographic");
+            //cmd.arg("-nographic");
 
             // If using UART1 (MiniUART), this enables serial
-            // cmd.arg("-serial");
-            // cmd.arg("null");
-            // cmd.arg("-serial");
-            // cmd.arg("stdio");
+            cmd.arg("-serial");
+            cmd.arg("null");
+            cmd.arg("-serial");
+            cmd.arg("stdio");
 
             cmd.arg("-M");
             cmd.arg("raspi3b");