From 0e4f82cb025b9073bb90c705ee29b5c9b77e76bb Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 30 Jan 2026 04:00:40 +0800 Subject: [PATCH] cleanup some hard-coded constants --- xtask/src/main.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 16318b11a..f9843a9d9 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -638,7 +638,7 @@ fn main() -> Result<(), Box> { builder.set_board(board); builder.add_loader_feature(board); builder.add_loader_feature("bao1x-usb"); - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "baremetal/src/platform/bao1x/link.x", (bao1x_api::BAREMETAL_START + sigblock_size + STATICS_LEN) as u32, @@ -651,7 +651,7 @@ fn main() -> Result<(), Box> { builder.set_board(board); builder.add_loader_feature(board); builder.add_loader_feature("bao1x-usb"); - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "baremetal/src/platform/bao1x/link.x", (bao1x_api::BAREMETAL_START + sigblock_size + STATICS_LEN) as u32, @@ -660,7 +660,7 @@ fn main() -> Result<(), Box> { } Some("baremetal-bao1x-evb") => { - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "baremetal/src/platform/bao1x/link.x", (0x6100_0000 + sigblock_size + STATICS_LEN) as u32, @@ -672,7 +672,7 @@ fn main() -> Result<(), Box> { } Some("bao1x-boot0") => { - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "bao1x-boot/boot0/link.x", (bao1x_api::BOOT0_START + sigblock_size + STATICS_LEN) as u32, @@ -684,7 +684,7 @@ fn main() -> Result<(), Box> { } Some("bao1x-boot1") => { - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "bao1x-boot/boot1/src/platform/bao1x/link.x", (bao1x_api::BOOT1_START + sigblock_size + STATICS_LEN) as u32, @@ -697,7 +697,7 @@ fn main() -> Result<(), Box> { } Some("bao1x-alt-boot1") => { - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "bao1x-boot/boot1/src/platform/bao1x/link.x", (bao1x_api::LOADER_START + sigblock_size + STATICS_LEN) as u32, @@ -711,7 +711,7 @@ fn main() -> Result<(), Box> { } Some("bao1x-boot1-lite") => { - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "bao1x-boot/boot1/src/platform/bao1x/link.x", (bao1x_api::BOOT1_START + sigblock_size + STATICS_LEN) as u32, @@ -725,7 +725,7 @@ fn main() -> Result<(), Box> { } Some("bao1x-alt-boot1-lite") => { - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "bao1x-boot/boot1/src/platform/bao1x/link.x", (bao1x_api::LOADER_START + sigblock_size + STATICS_LEN) as u32, @@ -751,7 +751,7 @@ fn main() -> Result<(), Box> { Some("baosec-improper-keystore") => { let board = "board-baosec"; - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "loader/src/platform/bao1x/link.x", (bao1x_api::LOADER_START + sigblock_size + STATICS_LEN) as u32, @@ -797,7 +797,7 @@ fn main() -> Result<(), Box> { Some("dabao") => { let board = "board-dabao"; - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "loader/src/platform/bao1x/link.x", (bao1x_api::LOADER_START + sigblock_size + STATICS_LEN) as u32, @@ -1139,7 +1139,7 @@ fn update_flash_origin>(path: P, new_origin: u32) -> std::io::Res fn baosec_common(builder: &mut Builder) -> std::io::Result<()> { let board = "board-baosec"; - let sigblock_size = 0x300; + let sigblock_size = bao1x_api::signatures::SIGBLOCK_LEN; update_flash_origin( "loader/src/platform/bao1x/link.x", (bao1x_api::LOADER_START + sigblock_size + STATICS_LEN) as u32,