diff --git a/libs/bao1x-api/src/lib.rs b/libs/bao1x-api/src/lib.rs index 6b0578f2d..2a970dfce 100644 --- a/libs/bao1x-api/src/lib.rs +++ b/libs/bao1x-api/src/lib.rs @@ -34,7 +34,7 @@ pub const BAOCHIP_1X_UF2_FAMILY: u32 = 0xa7d7_6373; // mfg ID 0b ==> XT25Q64FWOIGT cost down option (8MiB) pub const SPI_FLASH_IDS: [u32; 3] = [0x1820c2, 0x3825c2, 0x17600b]; // KGD 5D, mfg ID 9D; remainder of bits are part of the EID -pub const RAM_IDS: [u32; 2] = [0x5D9D, 0x559d]; +pub const RAM_IDS: [u32; 3] = [0x5D9D, 0x559d, 0x5D0D]; /// system preemption interval pub const SYSTEM_TICK_INTERVAL_MS: u32 = 10; diff --git a/loader/src/platform/bao1x/swap.rs b/loader/src/platform/bao1x/swap.rs index f170478eb..a9b92ed13 100644 --- a/loader/src/platform/bao1x/swap.rs +++ b/loader/src/platform/bao1x/swap.rs @@ -118,16 +118,17 @@ impl SwapHal { // re-check the ID to confirm we entered QPI mode correctly let flash_id = flash_spim.mem_read_id_flash(); - let ram_id = ram_spim.mem_read_id_ram(); + // QPI RAM ID is not allowed on APMemory devices, so this is removed for compatibility + // let ram_id = ram_spim.mem_read_id_ram(); crate::println!("QPI flash ID: {:x}", flash_id); - crate::println!("QPI ram ID: {:x}", ram_id); + // crate::println!("QPI ram ID: {:x}", ram_id); assert!( SPI_FLASH_IDS.contains(&(flash_id & 0xFF_FF_FF)), "flash_id {:#x} not recognized", flash_id ); // KGD 5D, mfg ID 9D; remainder of bits are part of the EID - assert!(RAM_IDS.contains(&(ram_id & 0xFF_FF)), "ram_id {:#x} not recognized", ram_id); + // assert!(RAM_IDS.contains(&(ram_id & 0xFF_FF)), "ram_id {:#x} not recognized", ram_id); // allocate the buf let mut buf = RawPage { data: [0u8; 4096] };