fix: bcm2837 serial

This commit is contained in:
2022-01-30 17:15:28 +02:00
parent d45a8adc34
commit 97c591f58f
4 changed files with 4 additions and 1 deletions
+1
View File
@@ -45,6 +45,7 @@ endif
ifeq ($(MACH),rpi3)
QEMU_OPTS+=-kernel $(O)/kernel.bin \
-initrd $(O)/initrd.img \
-dtb etc/bcm2837-rpi-3-b-plus.dtb \
-M raspi3b \
-serial mon:stdio \
-display none \
Binary file not shown.
+2
View File
@@ -4,6 +4,7 @@ use crate::dev::{
serial::{pl011::Pl011, SerialDevice},
Device,
};
use crate::fs::devfs::{self, CharDeviceType};
use crate::mem::phys;
use libsys::error::Errno;
@@ -37,6 +38,7 @@ pub fn init_board() -> Result<(), Errno> {
unsafe {
IRQCHIP.enable()?;
UART.init_irqs()?;
devfs::add_char_device(&UART, CharDeviceType::TtySerial)?;
EMMC.enable()?;
}
+1 -1
View File
@@ -71,6 +71,6 @@ macro_rules! block {
}};
($cond:expr, $timeout:expr) => {
crate::block!($cond, $timeout, return Err(error::Errno::TimedOut))
crate::block!($cond, $timeout, return Err(libsys::error::Errno::TimedOut))
};
}