Merge pull request #957 from iwanders/pico-feedback-issues-466-fix

thejpster · web-flow · commit c54eaeee0835 · 2025-09-06T14:35:26.000+01:00
RP2350: Fix handling of flags in BOOTSEL reboot calls.
diff --git a/rp235x-hal/CHANGELOG.md b/rp235x-hal/CHANGELOG.md
@@ -17,6 +17,7 @@ The Minimum-Supported Rust Version (MSRV) for the next release is 1.81
 
 - Update to pio 0.3.0
 - Update rand\_core to 0.9.3
+- Fix handling of flags in `RebootKind::BootSel` reboot.
 
 ## [0.3.0] - 2025-03-02
 
diff --git a/rp235x-hal/src/reboot.rs b/rp235x-hal/src/reboot.rs
@@ -69,7 +69,7 @@ pub fn reboot(kind: RebootKind, arch: RebootArch) -> ! {
             if msd_disabled {
                 flags |= 1;
             }
-            crate::rom_data::reboot(0x0002 | options, 500, 0, flags);
+            crate::rom_data::reboot(0x0002 | options, 500, flags, 0);
         }
         RebootKind::Ram { start_addr, size } => {
             crate::rom_data::reboot(0x0003 | options, 500, start_addr as u32, size as u32);

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ pub fn reboot(kind: RebootKind, arch: RebootArch) -> ! {`
`69`	`69`	`if msd_disabled {`
`70`	`70`	`flags \|= 1;`
`71`	`71`	`}`
`72`		`- crate::rom_data::reboot(0x0002 \| options, 500, 0, flags);`
	`72`	`+ crate::rom_data::reboot(0x0002 \| options, 500, flags, 0);`
`73`	`73`	`}`
`74`	`74`	`RebootKind::Ram { start_addr, size } => {`
`75`	`75`	`crate::rom_data::reboot(0x0003 \| options, 500, start_addr as u32, size as u32);`