From 92343551aa624229137f7f3a14ebb1dac4639a21 Mon Sep 17 00:00:00 2001
From: Dion Dokter <diondokter@gmail.com>
Date: Tue, 25 Jun 2024 14:31:15 +0200
Subject: [PATCH 1/2] RP: add option to provide your own boot2
---
embassy-rp/Cargo.toml | 8 ++++++++
embassy-rp/src/lib.rs | 1 +
2 files changed, 9 insertions(+)
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index 3ba6fe2e7..4f026335f 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -79,6 +79,14 @@ boot2-ram-memcpy = []
boot2-w25q080 = []
## Use boot2 with support for Winbond W25X10CL SPI flash.
boot2-w25x10cl = []
+## Have embassy not provide the boot2 so you can use your own.
+## Place your own in the ".boot2" section like:
+## ```
+## #[link_section = ".boot2"]
+## #[used]
+## static BOOT2: [u8; 256] = ...;
+## ```
+boot2-none = []
[dependencies]
embassy-sync = { version = "0.6.0", path = "../embassy-sync" }
diff --git a/embassy-rp/src/lib.rs b/embassy-rp/src/lib.rs
index 507d42280..b7e386d4f 100644
--- a/embassy-rp/src/lib.rs
+++ b/embassy-rp/src/lib.rs
@@ -226,6 +226,7 @@ macro_rules! select_bootloader {
}
}
+#[cfg(not(feature = "boot2-none"))]
select_bootloader! {
"boot2-at25sf128a" => BOOT_LOADER_AT25SF128A,
"boot2-gd25q64cs" => BOOT_LOADER_GD25Q64CS,
From 957be1980d721bbae1b7819b81b798051887ac7c Mon Sep 17 00:00:00 2001
From: Dion Dokter <diondokter@gmail.com>
Date: Tue, 25 Jun 2024 14:43:30 +0200
Subject: [PATCH 2/2] Fix syntax error?
---
embassy-rp/Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
index 4f026335f..447c96b4d 100644
--- a/embassy-rp/Cargo.toml
+++ b/embassy-rp/Cargo.toml
@@ -84,7 +84,7 @@ boot2-w25x10cl = []
## ```
## #[link_section = ".boot2"]
## #[used]
-## static BOOT2: [u8; 256] = ...;
+## static BOOT2: [u8; 256] = [0; 256]; // Provide your own with e.g. include_bytes!
## ```
boot2-none = []