From 4a4b5f182d2c61c60ddaa539d87972ee10361e23 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 22 Nov 2025 00:53:27 +0800 Subject: [PATCH 1/3] fix product description & serial number in baremetal --- baremetal/src/platform/bao1x/usb/handlers.rs | 5 ++++- baremetal/src/platform/bao1x/usb/mod.rs | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/baremetal/src/platform/bao1x/usb/handlers.rs b/baremetal/src/platform/bao1x/usb/handlers.rs index 6a9e6dcd8..ddf29338e 100644 --- a/baremetal/src/platform/bao1x/usb/handlers.rs +++ b/baremetal/src/platform/bao1x/usb/handlers.rs @@ -60,10 +60,13 @@ pub fn get_descriptor_request(this: &mut CorigineUsb, value: u16, _index: usize, ep0_buf[..4].copy_from_slice(&[4, USB_DT_STRING, 9, 4]); 4 } else { + let owc = bao1x_hal::acram::OneWayCounter::new(); + let slot_mgr = bao1x_hal::acram::SlotManager::new(); + let sn = bao1x_hal::usb::derive_usb_serial_number(&owc, &slot_mgr); let s = match id { 1 => MANUFACTURER, 2 => PRODUCT, - _ => SERIAL, + _ => &sn, }; let slen = 2 + s.len() * 2; ep0_buf[0] = slen as u8; diff --git a/baremetal/src/platform/bao1x/usb/mod.rs b/baremetal/src/platform/bao1x/usb/mod.rs index 6310c1c6b..7b92d64b8 100644 --- a/baremetal/src/platform/bao1x/usb/mod.rs +++ b/baremetal/src/platform/bao1x/usb/mod.rs @@ -132,9 +132,10 @@ struct DeviceDescriptor { const VENDOR_ID: u16 = 0x1209; const PRODUCT_ID: u16 = 0x3613; // this needs to change! this is the Precursor product ID. const MANUFACTURER: &'static str = "Baochip"; -const PRODUCT: &'static str = "Dabao"; -// no seriously, do this -const SERIAL: &'static str = "TODO"; +#[cfg(feature = "board-baosec")] +const PRODUCT: &'static str = "Baosec-Baremetal"; +#[cfg(not(feature = "board-baosec"))] +const PRODUCT: &'static str = "Dabao-Baremetal"; impl DeviceDescriptor { pub fn default_usb_acm() -> Self { From f502270b6036412ce59ecdadbac113c03753cb5e Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 22 Nov 2025 13:43:20 +0800 Subject: [PATCH 2/3] remove force-dabao default for altboot1 --- xtask/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 49cba0bdd..a9a55f697 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -697,7 +697,7 @@ fn main() -> Result<(), Box> { (bao1x_api::LOADER_START + sigblock_size + STATICS_LEN) as u32, )?; builder.add_loader_feature("alt-boot1"); - builder.add_loader_feature("force-dabao"); + // builder.add_loader_feature("force-dabao"); builder .set_baremetal(true) .target_baremetal_bao1x("bao1x-alt-boot1") From d124d60577798d7dd7c17d47ca411248cfa1d63d Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 22 Nov 2025 13:43:41 +0800 Subject: [PATCH 3/3] ensure that baremetal on baosec sets up USB pin; pass through redteam flag --- baremetal/Cargo.toml | 3 ++- baremetal/src/platform/bao1x/bao1x.rs | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/baremetal/Cargo.toml b/baremetal/Cargo.toml index 7458496e5..5b741d971 100644 --- a/baremetal/Cargo.toml +++ b/baremetal/Cargo.toml @@ -79,6 +79,7 @@ dabao-selftest = [ ] ci-security = [] spim-tests = [] +redteam = ["bao1x-hal/redteam"] verilator-only = [] -default = ["bao1x-usb", "ci-security"] +default = ["bao1x-usb"] diff --git a/baremetal/src/platform/bao1x/bao1x.rs b/baremetal/src/platform/bao1x/bao1x.rs index 824b094ba..f44209d7f 100644 --- a/baremetal/src/platform/bao1x/bao1x.rs +++ b/baremetal/src/platform/bao1x/bao1x.rs @@ -99,6 +99,9 @@ pub fn early_init() { bao1x_hal::board::setup_kb_pins(&iox); bao1x_hal::board::setup_oled_power_pin(&iox); bao1x_hal::board::setup_trng_power_pin(&iox); + // make sure SE0 is cleared + let (port, pin) = bao1x_hal::board::setup_usb_pins(&iox); + iox.set_gpio_pin(port, pin, IoxValue::High); } #[cfg(feature = "board-dabao")] {