vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ivan/raspi3b' into 'master'

Browse Source 
aarch64: init serial port by parsing dtb file

See merge request redox-os/kernel!241
This commit is contained in:
Jeremy Soller
2023-08-12 13:40:24 +00:00
parent 4d7d86d47c ca6699a11e
commit da6e9fd8d1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/aarch64/start.rs
+4 -4
View File
@@ -66,18 +66,18 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! {
KERNEL_SIZE.store(args.kernel_size, Ordering::SeqCst);
//TODO: Remove hard-coded UART for QEMU virt machine
{
if args.dtb_base == 0 {
let mut serial_port = crate::device::uart_pl011::SerialPort::new(
crate::PHYS_OFFSET + 0x9000000
);
serial_port.init(false);
serial_port.write(b"UART\n");
*crate::device::serial::COM1.lock() = Some(serial_port);
} else {
// Try to find serial port prior to logging
device::serial::init_early(crate::PHYS_OFFSET + args.dtb_base, args.dtb_size);
}
// Try to find serial port prior to logging
device::serial::init_early(crate::PHYS_OFFSET + args.dtb_base, args.dtb_size);
// Convert env to slice
let env = slice::from_raw_parts((args.env_base + crate::PHYS_OFFSET) as *const u8, args.env_size);