aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2025-03-27 13:26:22 +0000
committerGitHub <[email protected]>2025-03-27 13:26:22 +0000
commit8186847801a605876136ab7c47bb2bc2c27b1871 (patch)
tree730992222abd3d4a2048ba5db995e9fd67d75c02
parent9edf5b7f049f95742b60b041e4443967d8a6b708 (diff)
parent5777284304ec4b718204ed67d004f1e20856e3f9 (diff)
Merge pull request #4014 from adom-inc/rp-bootram-typo
rp: rename BOOTROM_BASE to BOOTRAM_BASE
-rw-r--r--embassy-rp/src/flash.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/embassy-rp/src/flash.rs b/embassy-rp/src/flash.rs
index fbc8b35ec..a69b44961 100644
--- a/embassy-rp/src/flash.rs
+++ b/embassy-rp/src/flash.rs
@@ -19,7 +19,7 @@ pub const FLASH_BASE: *const u32 = 0x10000000 as _;
19 19
20/// Address for xip setup function set up by the 235x bootrom. 20/// Address for xip setup function set up by the 235x bootrom.
21#[cfg(feature = "_rp235x")] 21#[cfg(feature = "_rp235x")]
22pub const BOOTROM_BASE: *const u32 = 0x400e0000 as _; 22pub const BOOTRAM_BASE: *const u32 = 0x400e0000 as _;
23 23
24/// If running from RAM, we might have no boot2. Use bootrom `flash_enter_cmd_xip` instead. 24/// If running from RAM, we might have no boot2. Use bootrom `flash_enter_cmd_xip` instead.
25// TODO: when run-from-ram is set, completely skip the "pause cores and jumpp to RAM" dance. 25// TODO: when run-from-ram is set, completely skip the "pause cores and jumpp to RAM" dance.
@@ -527,7 +527,7 @@ mod ram_helpers {
527 #[cfg(feature = "rp2040")] 527 #[cfg(feature = "rp2040")]
528 rom_data::memcpy44(&mut boot2 as *mut _, FLASH_BASE, 256); 528 rom_data::memcpy44(&mut boot2 as *mut _, FLASH_BASE, 256);
529 #[cfg(feature = "_rp235x")] 529 #[cfg(feature = "_rp235x")]
530 core::ptr::copy_nonoverlapping(BOOTROM_BASE as *const u8, boot2.as_mut_ptr() as *mut u8, 256); 530 core::ptr::copy_nonoverlapping(BOOTRAM_BASE as *const u8, boot2.as_mut_ptr() as *mut u8, 256);
531 flash_function_pointers_with_boot2(true, false, &boot2) 531 flash_function_pointers_with_boot2(true, false, &boot2)
532 } else { 532 } else {
533 flash_function_pointers(true, false) 533 flash_function_pointers(true, false)
@@ -560,7 +560,7 @@ mod ram_helpers {
560 #[cfg(feature = "rp2040")] 560 #[cfg(feature = "rp2040")]
561 rom_data::memcpy44(&mut boot2 as *mut _, FLASH_BASE, 256); 561 rom_data::memcpy44(&mut boot2 as *mut _, FLASH_BASE, 256);
562 #[cfg(feature = "_rp235x")] 562 #[cfg(feature = "_rp235x")]
563 core::ptr::copy_nonoverlapping(BOOTROM_BASE as *const u8, (boot2).as_mut_ptr() as *mut u8, 256); 563 core::ptr::copy_nonoverlapping(BOOTRAM_BASE as *const u8, (boot2).as_mut_ptr() as *mut u8, 256);
564 flash_function_pointers_with_boot2(true, true, &boot2) 564 flash_function_pointers_with_boot2(true, true, &boot2)
565 } else { 565 } else {
566 flash_function_pointers(true, true) 566 flash_function_pointers(true, true)
@@ -598,7 +598,7 @@ mod ram_helpers {
598 #[cfg(feature = "rp2040")] 598 #[cfg(feature = "rp2040")]
599 rom_data::memcpy44(&mut boot2 as *mut _, FLASH_BASE, 256); 599 rom_data::memcpy44(&mut boot2 as *mut _, FLASH_BASE, 256);
600 #[cfg(feature = "_rp235x")] 600 #[cfg(feature = "_rp235x")]
601 core::ptr::copy_nonoverlapping(BOOTROM_BASE as *const u8, boot2.as_mut_ptr() as *mut u8, 256); 601 core::ptr::copy_nonoverlapping(BOOTRAM_BASE as *const u8, boot2.as_mut_ptr() as *mut u8, 256);
602 flash_function_pointers_with_boot2(false, true, &boot2) 602 flash_function_pointers_with_boot2(false, true, &boot2)
603 } else { 603 } else {
604 flash_function_pointers(false, true) 604 flash_function_pointers(false, true)