From 19741d36152c0d5270702520ff5694a31ec8b2e9 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 1 Oct 2024 14:40:36 +0800 Subject: [PATCH] add new flash IDs to swap routine as well --- loader/src/platform/cramium/swap.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/loader/src/platform/cramium/swap.rs b/loader/src/platform/cramium/swap.rs index 8c0c008de..9d3fd02d4 100644 --- a/loader/src/platform/cramium/swap.rs +++ b/loader/src/platform/cramium/swap.rs @@ -235,7 +235,8 @@ impl SwapHal { crate::println!("flash ID: {:x}", flash_id); crate::println!("ram ID: {:x}", ram_id); // density 18, memory type 20, mfg ID C2 ==> MX25L128833F - assert!(flash_id & 0xFF_FF_FF == 0x1820C2); + // density 38, memory type 25, mfg ID C2 ==> MX25U12832F + assert!(flash_id & 0xFF_FF_FF == 0x1820C2 || flash_id & 0xFF_FF_FF == 0x38_25_C2); // KGD 5D, mfg ID 9D; remainder of bits are part of the EID assert!(ram_id & 0xFF_FF == 0x5D9D); @@ -260,7 +261,8 @@ impl SwapHal { crate::println!("QPI flash ID: {:x}", flash_id); crate::println!("QPI ram ID: {:x}", ram_id); // density 18, memory type 20, mfg ID C2 ==> MX25L128833F - assert!(flash_id & 0xFF_FF_FF == 0x1820C2); + // density 38, memory type 25, mfg ID C2 ==> MX25U12832F + assert!(flash_id & 0xFF_FF_FF == 0x1820C2 || flash_id & 0xFF_FF_FF == 0x38_25_C2); // KGD 5D, mfg ID 9D; remainder of bits are part of the EID assert!(ram_id & 0xFF_FF == 0x5D9D);