diff --git a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs
index 6b8e6f29c..7e4695986 100644
--- a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs
+++ b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs
@@ -249,6 +249,72 @@ pub fn early_init(mut board_type: bao1x_api::BoardTypeCoding) -> (bao1x_api::Boa
// power on
iox.set_gpio_pin_value(oled_on_port, oled_on_pin, IoxValue::High);
+
+ #[cfg(feature = "alt-boot1")]
+ {
+ crate::println!("entering pddb_erase");
+ // setup all the board pins to a known state
+ let iox = Iox::new(utra::iox::HW_IOX_BASE as *mut u32);
+ bao1x_hal::board::setup_memory_pins(&iox);
+
+ // this routine is used to initialize baosec products - sets the board type and
+ // erases the off-chip FLASH
+ use bao1x_api::baosec::PDDB_ORIGIN;
+ use bao1x_hal::{
+ board::SPINOR_BULK_ERASE_SIZE,
+ ifram::IframRange,
+ iox::Iox,
+ udma::{Spim, *},
+ };
+ let perclk = 100_000_000;
+ let udma_global = GlobalConfig::new();
+
+ // setup the I/O pins
+ let channel = bao1x_hal::board::setup_memory_pins(&iox);
+ udma_global.clock_on(bao1x_api::PeriphId::from(channel));
+ // safety: this is safe because clocks have been set up
+ let mut flash_spim = unsafe {
+ Spim::new_with_ifram(
+ channel,
+ // has to be half the clock frequency reaching the block, but
+ // run it as fast
+ // as we can run perclk
+ perclk / 4,
+ perclk / 2,
+ SpimClkPol::LeadingEdgeRise,
+ SpimClkPha::CaptureOnLeading,
+ SpimCs::Cs0,
+ 0,
+ 0,
+ None,
+ 256 + 16, /* just enough space to send commands + programming
+ * page */
+ 4096,
+ Some(6),
+ Some(SpimMode::Standard), // guess Standard
+ IframRange::from_raw_parts(
+ bao1x_hal::board::SPIM_FLASH_IFRAM_ADDR,
+ bao1x_hal::board::SPIM_FLASH_IFRAM_ADDR,
+ 4096 * 2,
+ ),
+ )
+ };
+ flash_spim.identify_flash_reset_qpi();
+ let flash_id = flash_spim.mem_read_id_flash();
+ crate::println!("flash ID (init): {:x}", flash_id);
+ if bao1x_api::SPI_FLASH_IDS.contains(&(flash_id & 0xFF_FF_FF)) {
+ let pddb_erase_len = SPINOR_BULK_ERASE_SIZE as usize * 2;
+ for addr in
+ (PDDB_ORIGIN..PDDB_ORIGIN + pddb_erase_len).step_by(SPINOR_BULK_ERASE_SIZE as usize)
+ {
+ crate::println!(" {:x}...", addr);
+ flash_spim.flash_erase_block(addr, SPINOR_BULK_ERASE_SIZE as usize);
+ }
+ crate::println!("...done!");
+ } else {
+ crate::println!("...skipped, couldn't find FLASH part");
+ }
+ }
}
#[cfg(not(feature = "oem"))]
BoardTypeCoding::Oem => {
diff --git a/baremetal/Cargo.toml b/baremetal/Cargo.toml
index a668c16d8..c4a70e32f 100644
--- a/baremetal/Cargo.toml
+++ b/baremetal/Cargo.toml
@@ -79,6 +79,7 @@ dabao-selftest = [
"xous-bio-bdma/baremetal",
"xous-bio-bdma/bao1x",
]
+factory-utils = ["ux-api/loader-baosec"]
ci-security = []
spim-tests = []
redteam = ["bao1x-hal/redteam"]
diff --git a/baremetal/src/main.rs b/baremetal/src/main.rs
index 2906e13bc..11abdd602 100644
--- a/baremetal/src/main.rs
+++ b/baremetal/src/main.rs
@@ -99,6 +99,8 @@ pub unsafe extern "C" fn rust_entry() -> ! {
#[cfg(feature = "dabao-selftest")]
let mut self_test_ran = false;
+ #[cfg(feature = "factory-utils")]
+ let mut factory_util_run = false;
#[cfg(feature = "bao1x-usb")]
// do the main loop through either USB interface or serial port
@@ -110,6 +112,13 @@ pub unsafe extern "C" fn rust_entry() -> ! {
self_test_ran = true;
}
}
+ #[cfg(feature = "factory-utils")]
+ {
+ if !factory_util_run {
+ crate::factory_utils::pddb_erase();
+ factory_util_run = true;
+ }
+ }
let (new_usb_state, new_portsc) = glue::usb_status();
diff --git a/baremetal/src/platform/bao1x.rs b/baremetal/src/platform/bao1x.rs
index ae994414f..c5e7f72db 100644
--- a/baremetal/src/platform/bao1x.rs
+++ b/baremetal/src/platform/bao1x.rs
@@ -4,9 +4,13 @@ pub use bao1x::*;
pub mod avtrng;
#[cfg(feature = "bao1x-bio")]
pub mod bio;
+#[cfg(feature = "factory-utils")]
+pub mod bitmaps;
#[cfg(feature = "dabao-selftest")]
pub mod dabao_selftest;
pub mod debug;
+#[cfg(feature = "factory-utils")]
+pub mod factory_utils;
pub mod irq;
#[cfg(feature = "bao1x-usb")]
pub mod usb;
diff --git a/baremetal/src/platform/bao1x/bitmaps/export.sh b/baremetal/src/platform/bao1x/bitmaps/export.sh
new file mode 100644
index 000000000..890291872
--- /dev/null
+++ b/baremetal/src/platform/bao1x/bitmaps/export.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# export.sh - run as part of build or manually
+
+set -e
+for svg in *.svg; do
+ base=$(basename "$svg" .svg)
+
+ # Export at native 128x128 — no scaling = no interpolation
+ inkscape "$svg" \
+ --export-type=png \
+ --export-width=128 \
+ --export-height=128 \
+ --export-text-to-path \
+ -o "/tmp/${base}.png"
+
+ # Hard threshold to pure 1-bit B&W — no dithering
+ convert "/tmp/${base}.png" \
+ -threshold 50% \
+ -monochrome \
+ -depth 1 \
+ "${base}.png"
+
+ python3 ./pngtorust.py -f "${base}.png" -o "${base}.rs"
+done
diff --git a/baremetal/src/platform/bao1x/bitmaps/factory_mode.png b/baremetal/src/platform/bao1x/bitmaps/factory_mode.png
new file mode 100644
index 000000000..370f9b4b2
Binary files /dev/null and b/baremetal/src/platform/bao1x/bitmaps/factory_mode.png differ
diff --git a/baremetal/src/platform/bao1x/bitmaps/factory_mode.rs b/baremetal/src/platform/bao1x/bitmaps/factory_mode.rs
new file mode 100644
index 000000000..8b7d67575
--- /dev/null
+++ b/baremetal/src/platform/bao1x/bitmaps/factory_mode.rs
@@ -0,0 +1,132 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
+pub const BITMAP: [u32; 512] = [
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0x0fffffff, 0x0383f8f0, 0xc601f078, 0xffffffe3,
+ 0x0fffffff, 0x0301f870, 0x8c01c038, 0xfffffff3,
+ 0xcfffffff, 0x3e38f07f, 0x8cf9c71f, 0xfffffff1,
+ 0xcfffffff, 0x3e7c707f, 0x9cf98f8f, 0xfffffff9,
+ 0x8fffffff, 0x3ffc723f, 0x3cf99f8f, 0xfffffff8,
+ 0x0fffffff, 0x3ffc6338, 0x3e019fcf, 0xfffffffc,
+ 0x0fffffff, 0x3ffc6738, 0x7e019fcf, 0xfffffffc,
+ 0xcfffffff, 0x3ffc601f, 0x7c798f8f, 0xfffffffe,
+ 0xcfffffff, 0x3e7cc01f, 0x7cf98f8f, 0xfffffffe,
+ 0xcfffffff, 0x3e38c79f, 0x7cf9c71f, 0xfffffffe,
+ 0xcfffffff, 0x3f01cf8f, 0x7cf9e03f, 0xfffffffe,
+ 0xcfffffff, 0x3f83cfcf, 0x7cf9f07f, 0xfffffffe,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xe3f1f3ff, 0xff807f07, 0xffffffff,
+ 0xffffffff, 0x80f1e1ff, 0xff807807, 0xffffffff,
+ 0xffffffff, 0x1870e1ff, 0xfffe70c7, 0xffffffff,
+ 0xffffffff, 0x3e70e1ff, 0xfffe73e6, 0xffffffff,
+ 0xffffffff, 0x3e30c1ff, 0xfffe63e6, 0xffffffff,
+ 0xffffffff, 0x7e32c9ff, 0xff8063e6, 0xffffffff,
+ 0xffffffff, 0x7f32c9ff, 0xff8063e6, 0xffffffff,
+ 0xffffffff, 0x7e3259ff, 0xfffe63e6, 0xffffffff,
+ 0xffffffff, 0x3e3219ff, 0xfffe73e6, 0xffffffff,
+ 0xffffffff, 0x3e7219ff, 0xfffe71e7, 0xffffffff,
+ 0xffffffff, 0x007319ff, 0xff807807, 0xffffffff,
+ 0xffffffff, 0x80f319ff, 0xff807c07, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xf80007ff, 0x4fffee7d, 0xfffffffe,
+ 0x007fffff, 0xf8000780, 0xcfff001d, 0xfffffffc,
+ 0x3fffffff, 0xffffe7ff, 0xcfff801d, 0xffffffff,
+ 0x3fffffff, 0x3fffe7ff, 0x0003ee70, 0xfffffff8,
+ 0x3fffffff, 0x3fffe7ff, 0x00078030, 0xfffffff8,
+ 0x3fffffff, 0xffffe7ff, 0xcfff9fbc, 0xffffffff,
+ 0x3fffffff, 0xffffe7ff, 0xcfff9fb8, 0xffffffff,
+ 0x3fffffff, 0xffffe7ff, 0xcfff8038, 0xffffffff,
+ 0x3fffffff, 0x7fffe7ff, 0xd8079fb0, 0xffffffff,
+ 0x3fffffff, 0x7fffe7ff, 0xdf3f8034, 0xffffffff,
+ 0x3fffffff, 0x7fffe7ff, 0x9f3ff9fd, 0xffffffff,
+ 0x3fffffff, 0x3ffff7ff, 0x9f3ff9fd, 0xffffffff,
+ 0x3fffffff, 0xbffff7ff, 0xbf3f001d, 0xfffffffb,
+ 0x3fffffff, 0xfffff3ff, 0x3f3ff0fd, 0xfffffff3,
+ 0x3fffffff, 0xfffff3ff, 0x303fe4fd, 0xfffffffb,
+ 0x3fffffff, 0xfffff3ff, 0x7e03ce3d, 0xfffffff8,
+ 0x003fffff, 0xfffffb00, 0xffff1f8d, 0xfffffff8,
+ 0xffffffff, 0xffffffff, 0xfffffffd, 0xfffffffd,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
+
+];
diff --git a/baremetal/src/platform/bao1x/bitmaps/factory_mode.svg b/baremetal/src/platform/bao1x/bitmaps/factory_mode.svg
new file mode 100644
index 000000000..6956a00e2
--- /dev/null
+++ b/baremetal/src/platform/bao1x/bitmaps/factory_mode.svg
@@ -0,0 +1,174 @@
+
+
+
+
diff --git a/baremetal/src/platform/bao1x/bitmaps/mod.rs b/baremetal/src/platform/bao1x/bitmaps/mod.rs
new file mode 100644
index 000000000..aacb6985f
--- /dev/null
+++ b/baremetal/src/platform/bao1x/bitmaps/mod.rs
@@ -0,0 +1 @@
+pub mod factory_mode;
diff --git a/baremetal/src/platform/bao1x/bitmaps/pngtorust.py b/baremetal/src/platform/bao1x/bitmaps/pngtorust.py
new file mode 100644
index 000000000..ae377459e
--- /dev/null
+++ b/baremetal/src/platform/bao1x/bitmaps/pngtorust.py
@@ -0,0 +1,79 @@
+#!/usr/bin/python3
+
+import argparse
+import numpy as np
+from PIL import Image
+
+def bitflip(data_block, bitwidth=32):
+ if bitwidth == 0:
+ return data_block
+
+ bytewidth = bitwidth // 8
+ bitswapped = bytearray()
+
+ i = 0
+ while i < len(data_block):
+ data = int.from_bytes(data_block[i:i+bytewidth], byteorder='big', signed=False)
+ b = '{:0{width}b}'.format(data, width=bitwidth)
+ bitswapped.extend(int(b[::-1], 2).to_bytes(bytewidth, byteorder='big'))
+ i = i + bytewidth
+
+ return bytes(bitswapped)
+
+
+def convert(ifile, ofile):
+ # Open the image and convert it to 1-bit mode (black & white)
+ im = Image.open(ifile).transpose(Image.Transpose.FLIP_LEFT_RIGHT)
+ # im = Image.open(ifile)
+ im = im.convert("1") # pixels will be either 0 (black) or 255 (white)
+
+ # Get pixel data in row-major order
+ pixels = list(im.getdata())
+
+ packed = []
+ current = 0
+ count = 0
+
+ # Process each pixel: assign bit value 1 for white (255) and 0 for black (0)
+ for p in pixels:
+ bit = 0 if p else 1
+ # Place the bit in the current 32-bit integer at the position given by count
+ current |= (bit << (31 - count))
+ count += 1
+ if count == 32:
+ packed.append(current)
+ current = 0
+ count = 0
+
+ # If there are remaining pixels that do not fill up a complete 32-bit word,
+ # append the last partially-filled integer.
+ if count > 0:
+ packed.append(current)
+
+ with open(ofile, "w") as output:
+ output.write("#![cfg_attr(rustfmt, rustfmt_skip)]\n")
+ output.write("pub const BITMAP: [u32; 512] = [\n")
+ for index in range(512 // 4):
+ output.write(" 0x{:08x}, 0x{:08x}, 0x{:08x}, 0x{:08x},\n"
+ .format(packed[index * 4 + 3], packed[index * 4 + 2], packed[index * 4 + 1], packed[index * 4 + 0]))
+ output.write("\n];\n")
+
+
+def main():
+ parser = argparse.ArgumentParser(description="Convert BMP to rust header file")
+ parser.add_argument(
+ "-f", "--file", required=False, help="filename to process", type=str, default="libs/ux-api/src/bitmaps/test1.png"
+ )
+ parser.add_argument(
+ "-o", "--output-file", required=False, help="name of output Rust file", type=str, default="test1.rs"
+ )
+ args = parser.parse_args()
+
+ ifile = args.file
+
+ convert(ifile, args.output_file)
+
+
+if __name__ == "__main__":
+ main()
+
diff --git a/baremetal/src/platform/bao1x/factory_utils.rs b/baremetal/src/platform/bao1x/factory_utils.rs
new file mode 100644
index 000000000..092ded23b
--- /dev/null
+++ b/baremetal/src/platform/bao1x/factory_utils.rs
@@ -0,0 +1,91 @@
+use bao1x_hal::acram::OneWayCounter;
+use utralib::*;
+use ux_api::minigfx::FrameBuffer;
+
+// build with `cargo xtask bao1x-baremetal-baosec --loader-feature factory-utils`
+pub fn pddb_erase() {
+ crate::println!("entering pddb_erase");
+ let one_way = OneWayCounter::new();
+ while one_way.get_decoded::().expect("couldn't fetch flag")
+ != bao1x_api::BootWaitCoding::Enable
+ {
+ one_way.inc_coded::().unwrap();
+ }
+
+ // setup all the board pins to a known state
+ let iox = Iox::new(utra::iox::HW_IOX_BASE as *mut u32);
+ bao1x_hal::board::setup_display_pins(&iox);
+ bao1x_hal::board::setup_memory_pins(&iox);
+ bao1x_hal::board::setup_oled_power_pin(&iox);
+
+ // this routine is used to initialize baosec products - sets the board type and
+ // erases the off-chip FLASH
+ use bao1x_api::baosec::PDDB_ORIGIN;
+ use bao1x_hal::{
+ board::SPINOR_BULK_ERASE_SIZE,
+ ifram::IframRange,
+ iox::Iox,
+ udma::{Spim, *},
+ };
+ let perclk = 100_000_000;
+ let udma_global = GlobalConfig::new();
+
+ // setup the I/O pins
+ let channel = bao1x_hal::board::setup_memory_pins(&iox);
+ udma_global.clock_on(bao1x_api::PeriphId::from(channel));
+ // safety: this is safe because clocks have been set up
+ let mut flash_spim = unsafe {
+ Spim::new_with_ifram(
+ channel,
+ // has to be half the clock frequency reaching the block, but
+ // run it as fast
+ // as we can run perclk
+ perclk / 4,
+ perclk / 2,
+ SpimClkPol::LeadingEdgeRise,
+ SpimClkPha::CaptureOnLeading,
+ SpimCs::Cs0,
+ 0,
+ 0,
+ None,
+ 256 + 16, /* just enough space to send commands + programming
+ * page */
+ 4096,
+ Some(6),
+ Some(SpimMode::Standard), // guess Standard
+ IframRange::from_raw_parts(
+ bao1x_hal::board::SPIM_FLASH_IFRAM_ADDR,
+ bao1x_hal::board::SPIM_FLASH_IFRAM_ADDR,
+ 4096 * 2,
+ ),
+ )
+ };
+ flash_spim.identify_flash_reset_qpi();
+ let flash_id = flash_spim.mem_read_id_flash();
+ crate::println!("flash ID (init): {:x}", flash_id);
+ if !bao1x_api::SPI_FLASH_IDS.contains(&(flash_id & 0xFF_FF_FF)) {
+ return;
+ }
+
+ let pddb_erase_len = SPINOR_BULK_ERASE_SIZE as usize * 2;
+ for addr in (PDDB_ORIGIN..PDDB_ORIGIN + pddb_erase_len).step_by(SPINOR_BULK_ERASE_SIZE as usize) {
+ crate::println!(" {:x}...", addr);
+ flash_spim.flash_erase_block(addr, SPINOR_BULK_ERASE_SIZE as usize);
+ }
+ crate::println!("...done!");
+
+ let mut iox = Iox::new(utra::iox::HW_IOX_BASE as *mut u32);
+ // redraw or show the boot logo - depending on how boot1 went, we may or may not have it already
+ let mut udma_global = GlobalConfig::new();
+ let mut sh1107 = bao1x_hal::sh1107::Oled128x128::new(
+ bao1x_hal::sh1107::MainThreadToken::new(),
+ perclk,
+ &mut iox,
+ &mut udma_global,
+ );
+ sh1107.init().ok();
+ sh1107.buffer_mut().fill(0xFFFF_FFFF);
+ sh1107.blit_screen(&crate::platform::bao1x::bitmaps::factory_mode::BITMAP);
+ sh1107.draw().ok();
+ crate::println!("leaving pddb_erase");
+}