Skip to content

parse dtb except gicc #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhw2002426 merged 2 commits into from
Feb 18, 2025
Merged

parse dtb except gicc #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dfd957
parse dtb except gicc
coolyjg May 6, 2024
0bdcab1
Merge branch 'gicv3' into DTB
lhw2002426 Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'gicv3' into DTB
  • Loading branch information
@lhw2002426
lhw2002426 authored Feb 18, 2025
commit 0bdcab17c5b866b6c5be0a2dd08fcb127baf6e1a
12 changes: 12 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion modules/ruxruntime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ smp = ["ruxhal/smp"]
irq = ["ruxhal/irq", "ruxtask?/irq", "percpu", "kernel_guard", "ruxdtb/irq"]
tls = ["ruxhal/tls", "ruxtask?/tls"]
alloc = ["axalloc", "dtb", "ruxdtb"]
paging = ["ruxhal/paging", "lazy_init"]
paging = ["ruxhal/paging", "ruxmm/paging", "lazy_init", "ruxtask/paging"]
rtc = ["ruxhal/rtc"]
virtio_console = []

Expand Down Expand Up @@ -55,6 +55,7 @@ ruxmm = { path = "../ruxmm" }
axsync = { path = "../axsync", optional = true }
ruxfutex = { path = "../ruxfutex", optional = true }
ruxdtb = { path = "../ruxdtb", optional = true }
ruxrand = { path = "../ruxrand", optional = true }

crate_interface = "0.1.1"
percpu = { path = "../../crates/percpu", optional = true }
Expand Down
4 changes: 4 additions & 0 deletions modules/ruxruntime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ pub extern "C" fn rust_main(cpu_id: usize, dtb: usize) -> ! {
#[cfg(feature = "tty")]
tty::init();

//let debug_res = lhw_debug();
//info!("lhw debug res {}",debug_res);

#[cfg(feature = "alloc")]
{
let pl011_base = ruxdtb::get_pl011_base();
Expand All @@ -218,6 +221,7 @@ pub extern "C" fn rust_main(cpu_id: usize, dtb: usize) -> ! {
}

info!("Initialize platform devices...");

ruxhal::platform_init();

#[cfg(feature = "rand")]
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.