From 815621d829ea894ae18fcb12bf3bf1c3630f844f Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 6 Nov 2025 14:10:38 +0800 Subject: [PATCH] update handling of id numbers --- bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs | 6 +++--- bao1x-boot/boot1/src/repl.rs | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs b/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs index b7d0a953c..8d693af16 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs @@ -132,10 +132,10 @@ struct DeviceDescriptor { pub i_serial_number: u8, pub b_num_configurations: u8, } -const VENDOR_ID: u16 = 0x1209; -const PRODUCT_ID: u16 = 0x3613; // this needs to change! this is the Precursor product ID. +const VENDOR_ID: u16 = 0x1d50; +const PRODUCT_ID: u16 = 0x6196; // This is pending acceptance of a PR to the openmoko registry const MANUFACTURER: &'static str = "Baochip"; -const PRODUCT: &'static str = "Dabao"; +const PRODUCT: &'static str = "Baochip-1x"; impl DeviceDescriptor { #[allow(dead_code)] diff --git a/bao1x-boot/boot1/src/repl.rs b/bao1x-boot/boot1/src/repl.rs index 01b849333..8dd2417c6 100644 --- a/bao1x-boot/boot1/src/repl.rs +++ b/bao1x-boot/boot1/src/repl.rs @@ -281,6 +281,14 @@ impl Repl { "Public serial number: {}", bao1x_hal::usb::derive_usb_serial_number(&owc, &slot_mgr) ); + let uuid = slot_mgr.read(&bao1x_hal::board::UUID).unwrap(); + crate::println!( + "UUID: {:08x}-{:08x}-{:08x}-{:08x}", + u32::from_le_bytes(uuid[12..16].try_into().unwrap()), + u32::from_le_bytes(uuid[8..12].try_into().unwrap()), + u32::from_le_bytes(uuid[4..8].try_into().unwrap()), + u32::from_le_bytes(uuid[..4].try_into().unwrap()) + ); crate::println!("Revocations:"); crate::println!("Stage key0 key1 key2 key3"); let key_array = [