From e201574eb8705ad8faecdef84cc76c365539ec60 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 30 Apr 2024 17:47:57 +0800 Subject: [PATCH] put the verification in the right area --- loader/src/platform/cramium/cramium.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/src/platform/cramium/cramium.rs b/loader/src/platform/cramium/cramium.rs index cca6b9b99..83c5452d3 100644 --- a/loader/src/platform/cramium/cramium.rs +++ b/loader/src/platform/cramium/cramium.rs @@ -514,10 +514,6 @@ pub fn early_init() { udma_uart.read(&mut rx_buf[..1]); flash_spim.mem_qpi_mode(true); ram_spim.mem_qpi_mode(true); - // density 18, memory type 20, mfg ID C2 ==> MX25L128833F - assert!(flash_id & 0xFF_FF_FF == 0x1820C2); - // KGD 5D, mfg ID 9D; remainder of bits are part of the EID - assert!(ram_id & 0xFF_FF == 0x5D9D); crate::println!("read ID QPI mode..."); udma_uart.read(&mut rx_buf[..1]); @@ -525,6 +521,10 @@ pub fn early_init() { 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); + // density 18, memory type 20, mfg ID C2 ==> MX25L128833F + assert!(flash_id & 0xFF_FF_FF == 0x1820C2); + // KGD 5D, mfg ID 9D; remainder of bits are part of the EID + assert!(ram_id & 0xFF_FF == 0x5D9D); let mut chk_buf = [0u8; 32]; crate::println!("first read...");