From 519ae3148592400791d609d65e4bea424a008290 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 6 Jun 2024 17:55:10 +0800 Subject: [PATCH] loader mods to harmonize with driver bounds --- loader/src/platform/cramium/cramium.rs | 11 ++++++++++- loader/src/platform/cramium/link-soc.x | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/loader/src/platform/cramium/cramium.rs b/loader/src/platform/cramium/cramium.rs index 83e7babf8..6ca302839 100644 --- a/loader/src/platform/cramium/cramium.rs +++ b/loader/src/platform/cramium/cramium.rs @@ -639,7 +639,16 @@ pub fn early_init() { #[cfg(feature = "usb-test")] { udma_uart.write("USB basic test...\n\r".as_bytes()); - let mut usb = cramium_hal::usb::driver::CorigineUsb::new(); + let csr = + cramium_hal::usb::compat::AtomicCsr::new(cramium_hal::usb::utra::CORIGINE_USB_BASE as *mut u32); + // safety: this is safe because we are in machine mode, and vaddr/paddr always pairs up + let mut usb = unsafe { + cramium_hal::usb::driver::CorigineUsb::new( + 0, // is dummy in no-std + cramium_hal::usb::driver::CRG_UDC_MEMBASE, + csr, + ) + }; usb.reset(); let mut idle_timer = 0; let mut vbus_on = false; diff --git a/loader/src/platform/cramium/link-soc.x b/loader/src/platform/cramium/link-soc.x index 2514ff015..91f1a1b42 100644 --- a/loader/src/platform/cramium/link-soc.x +++ b/loader/src/platform/cramium/link-soc.x @@ -86,12 +86,12 @@ SECTIONS . = ALIGN(4); _edata = .; } > REGION_DATA AT > REGION_RODATA -/* + .fonts : ALIGN(65536) { KEEP(*(.fontdata)); } > FONTS -*/ + .bss (NOLOAD) : { _sbss = .;