mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
cleanup apis and reset spi memory mode at top of boot1
This commit is contained in:
parent
60f1b90acb
commit
5a8c7c7aa3
2 changed files with 6 additions and 2 deletions
|
|
@ -56,14 +56,16 @@ pub fn setup_spim(perclk: u32) {
|
||||||
* page */
|
* page */
|
||||||
4096,
|
4096,
|
||||||
Some(6),
|
Some(6),
|
||||||
None,
|
Some(SpimMode::Standard), // guess Standard
|
||||||
IframRange::from_raw_parts(SPIM_FLASH_IFRAM_ADDR, SPIM_FLASH_IFRAM_ADDR, 4096 * 2),
|
IframRange::from_raw_parts(SPIM_FLASH_IFRAM_ADDR, SPIM_FLASH_IFRAM_ADDR, 4096 * 2),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
flash_spim.mem_qpi_mode(false);
|
flash_spim.identify_flash_reset_qpi();
|
||||||
let flash_id = flash_spim.mem_read_id_flash();
|
let flash_id = flash_spim.mem_read_id_flash();
|
||||||
crate::println_d!("flash ID (init): {:x}", flash_id);
|
crate::println_d!("flash ID (init): {:x}", flash_id);
|
||||||
|
|
||||||
|
flash_spim.flash_set_qe(); // ensure that QE bit is set; does nothing if already set
|
||||||
|
|
||||||
flash_spim.mem_qpi_mode(true);
|
flash_spim.mem_qpi_mode(true);
|
||||||
let flash_id = flash_spim.mem_read_id_flash();
|
let flash_id = flash_spim.mem_read_id_flash();
|
||||||
crate::println_d!("QPI flash ID: {:x}", flash_id);
|
crate::println_d!("QPI flash ID: {:x}", flash_id);
|
||||||
|
|
@ -92,6 +94,7 @@ pub fn write_spim_page(addr: usize, data: Box<[u8; SPINOR_ERASE_SIZE as usize]>)
|
||||||
256 + 16,
|
256 + 16,
|
||||||
4096,
|
4096,
|
||||||
6,
|
6,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
crate::println_d!("Erasing sector at addr {:x}", addr);
|
crate::println_d!("Erasing sector at addr {:x}", addr);
|
||||||
|
|
|
||||||
|
|
@ -325,6 +325,7 @@ pub fn usb_ep1_bulk_out_complete(
|
||||||
2048 + 256,
|
2048 + 256,
|
||||||
2048,
|
2048,
|
||||||
0,
|
0,
|
||||||
|
None,
|
||||||
),
|
),
|
||||||
&iox,
|
&iox,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue