loader mods to harmonize with driver bounds

This commit is contained in:
bunnie 2024-06-06 17:55:10 +08:00
parent e9217b7eb6
commit 519ae31485
2 changed files with 12 additions and 3 deletions

View file

@ -639,7 +639,16 @@ pub fn early_init() {
#[cfg(feature = "usb-test")] #[cfg(feature = "usb-test")]
{ {
udma_uart.write("USB basic test...\n\r".as_bytes()); 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(); usb.reset();
let mut idle_timer = 0; let mut idle_timer = 0;
let mut vbus_on = false; let mut vbus_on = false;

View file

@ -86,12 +86,12 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_edata = .; _edata = .;
} > REGION_DATA AT > REGION_RODATA } > REGION_DATA AT > REGION_RODATA
/*
.fonts : ALIGN(65536) .fonts : ALIGN(65536)
{ {
KEEP(*(.fontdata)); KEEP(*(.fontdata));
} > FONTS } > FONTS
*/
.bss (NOLOAD) : .bss (NOLOAD) :
{ {
_sbss = .; _sbss = .;