diff --git a/bao1x-boot/boot1/src/platform/bao1x/usb/glue.rs b/bao1x-boot/boot1/src/platform/bao1x/usb/glue.rs index f4f154e19..4ab2d6007 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/usb/glue.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/usb/glue.rs @@ -56,14 +56,16 @@ pub fn setup_spim(perclk: u32) { * page */ 4096, Some(6), - None, + Some(SpimMode::Standard), // guess Standard 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(); 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); let flash_id = flash_spim.mem_read_id_flash(); 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, 4096, 6, + None, ) }; crate::println_d!("Erasing sector at addr {:x}", addr); diff --git a/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs b/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs index 75ad9f9f0..1fc7baf5c 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs @@ -325,6 +325,7 @@ pub fn usb_ep1_bulk_out_complete( 2048 + 256, 2048, 0, + None, ), &iox, )