From 77f6887fbcc03207a7c28c08e45ad64774c323c0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 7 May 2021 08:54:36 -0600 Subject: [PATCH] Debug use of memory map and env data --- src/arch/aarch64/start.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/arch/aarch64/start.rs b/src/arch/aarch64/start.rs index e32c3a3..d75b3e9 100644 --- a/src/arch/aarch64/start.rs +++ b/src/arch/aarch64/start.rs @@ -90,10 +90,13 @@ pub unsafe extern fn kstart(args_ptr: *const KernelArgs) -> ! { info!("Env: {:X}:{:X}", env_base, env_base + env_size); info!("DTB: {:X}:{:X}", dtb_base, dtb_base + dtb_size); - //TODO: Until fixed, the DTB is at DEVMAP_OFFSET + dtb_base - // This is not required after paging is enabled because paging fixes this + println!("FILL MEMORY MAP START"); device_tree::fill_memory_map(crate::KERNEL_DEVMAP_OFFSET + dtb_base, dtb_size); + println!("FILL MEMORY MAP COMPLETE"); + + println!("FILL ENV DATA START"); let env_size = device_tree::fill_env_data(crate::KERNEL_DEVMAP_OFFSET + dtb_base, dtb_size, env_base); + println!("FILL ENV DATA COMPLETE"); // Initialize RMM println!("RMM INIT START");