From 711ea9a4edde60a273f4a647a88adf50f76bf6a2 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sat, 13 Sep 2025 13:00:00 +0200 Subject: [PATCH] Move system76_ec::init() into serial::init() --- src/arch/x86_shared/device/serial.rs | 3 +++ src/arch/x86_shared/start.rs | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/arch/x86_shared/device/serial.rs b/src/arch/x86_shared/device/serial.rs index 0307e27f44..3a9277c939 100644 --- a/src/arch/x86_shared/device/serial.rs +++ b/src/arch/x86_shared/device/serial.rs @@ -10,6 +10,9 @@ pub static COM2: Mutex = Mutex::new(SerialKind::NotPresent); pub static LPSS: Mutex = Mutex::new(SerialKind::NotPresent); pub unsafe fn init() { + #[cfg(feature = "system76_ec_debug")] + super::system76_ec::init(); + if cfg!(not(feature = "serial_debug")) { // FIXME remove serial_debug feature once ACPI SPCR is respected on UEFI boots. return; diff --git a/src/arch/x86_shared/start.rs b/src/arch/x86_shared/start.rs index 516f4dedf7..b456864fa2 100644 --- a/src/arch/x86_shared/start.rs +++ b/src/arch/x86_shared/start.rs @@ -90,9 +90,6 @@ pub unsafe extern "C" fn kstart(args_ptr: *const KernelArgs) -> ! { // Set up graphical debug graphical_debug::init(env); - #[cfg(feature = "system76_ec_debug")] - device::system76_ec::init(); - info!("Redox OS starting..."); info!( "Kernel: {:X}:{:X}",