feat: make merge_config public and add PartialEq to Arch enum; expose elf and uboot fields in TestPrepare

Author: ZR233

ostool/src/config/loader.rs

@@ -110,7 +110,7 @@ impl ConfigLoader {
         Ok(())
     }
 
-    fn merge_config(&self, base: &mut ProjectConfig, overlay: &ProjectConfig) {
+    pub fn merge_config(&self, base: &mut ProjectConfig, overlay: &ProjectConfig) {
         // Simple merge strategy - overlay takes precedence
         if !overlay.compile.target.is_empty() {
             base.compile.target = overlay.compile.target.clone();

ostool/src/project.rs

@@ -130,7 +130,7 @@ impl Project {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Arch {
     Aarch64,
     Riscv64,

ostool/src/step/mod.rs

@@ -15,4 +15,5 @@ pub use uboot::*;
 
 pub trait Step {
     fn run(&mut self, project: &mut Project) -> Result<()>;
+    fn is_debug(&self) -> bool { false }
 }

ostool/src/step/test_prepare.rs

@@ -37,8 +37,8 @@ impl From<Architecture> for Arch {
 
 /// Unified test preparation step that handles both cargo test and manual testing
 pub struct TestPrepare {
-    elf: Option<String>,
-    uboot: bool,
+    pub elf: Option<String>,
+    pub uboot: bool,
 }
 
 impl TestPrepare {