From 14a618b48d9710bbdf54674849fbcb1d8c2f1831 Mon Sep 17 00:00:00 2001 From: morgan Date: Fri, 24 May 2024 10:53:14 +0800 Subject: [PATCH] kasli: enable interrupts --- artiq/firmware/runtime/main.rs | 5 +++++ artiq/firmware/satman/main.rs | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/artiq/firmware/runtime/main.rs b/artiq/firmware/runtime/main.rs index 6d26432a7..f1519b646 100644 --- a/artiq/firmware/runtime/main.rs +++ b/artiq/firmware/runtime/main.rs @@ -36,6 +36,8 @@ use smoltcp::wire::HardwareAddress; use board_misoc::{csr, ident, clock, spiflash, config, net_settings, pmp, boot}; #[cfg(has_ethmac)] use board_misoc::ethmac; +#[cfg(soc_platform = "kasli")] +use board_misoc::irq; use board_misoc::net_settings::{Ipv4AddrConfig}; #[cfg(has_drtio)] use board_artiq::drtioaux; @@ -265,6 +267,9 @@ pub extern fn main() -> i32 { pmp::init_stack_guard(&_sstack_guard as *const u8 as usize); + #[cfg(soc_platform = "kasli")] + irq::enable_interrupts(); + logger_artiq::BufferLogger::new(&mut LOG_BUFFER[..]).register(|| boot::start_user(startup as usize) ); diff --git a/artiq/firmware/satman/main.rs b/artiq/firmware/satman/main.rs index 62494714e..f865ee406 100644 --- a/artiq/firmware/satman/main.rs +++ b/artiq/firmware/satman/main.rs @@ -17,6 +17,8 @@ use core::convert::TryFrom; use board_misoc::{csr, ident, clock, uart_logger, i2c, pmp}; #[cfg(has_si5324)] use board_artiq::si5324; +#[cfg(soc_platform = "kasli")] +use board_misoc::irq; use board_artiq::{spi, drtioaux, drtio_routing}; #[cfg(soc_platform = "efc")] use board_artiq::ad9117; @@ -630,6 +632,8 @@ pub extern fn main() -> i32 { ALLOC.add_range(&mut _fheap, &mut _eheap); pmp::init_stack_guard(&_sstack_guard as *const u8 as usize); } + #[cfg(soc_platform = "kasli")] + irq::enable_interrupts(); clock::init(); uart_logger::ConsoleLogger::register();