diff --git a/firmware/rust1-bootloader/.cargo/config.toml b/firmware/rust1-bootloader/.cargo/config.toml
new file mode 100644
index 0000000000000000000000000000000000000000..795ee043a46683d70a569b2332b49f7a0ca731ff
--- /dev/null
+++ b/firmware/rust1-bootloader/.cargo/config.toml
@@ -0,0 +1,8 @@
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+runner = "probe-rs-cli run --chip RP2040"
+
+[build]
+target = "thumbv6m-none-eabi"
+
+[env]
+DEFMT_LOG = "trace"
diff --git a/firmware/rust1-bootloader/Cargo.toml b/firmware/rust1-bootloader/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..b4167bcd86e98d160666e27e90335726dd7005d2
--- /dev/null
+++ b/firmware/rust1-bootloader/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+edition = "2021"
+name = "rp-bootloader-example"
+version = "0.1.0"
+description = "Example bootloader for RP2040 chips"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+defmt = { version = "0.3", optional = true }
+defmt-rtt = { version = "0.4", optional = true }
+
+embassy-rp = { path = "../../../../embassy-rp", default-features = false, features = ["nightly"] }
+embassy-boot-rp = { path = "../../../../embassy-boot/rp", default-features = false }
+embassy-time = { path = "../../../../embassy-time", features = ["nightly"] }
+
+cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
+cortex-m-rt = { version = "0.7" }
+embedded-storage = "0.3.0"
+embedded-storage-async = "0.4.0"
+cfg-if = "1.0.0"
+
+[features]
+defmt = [
+ "dep:defmt",
+ "embassy-boot-rp/defmt",
+ "embassy-rp/defmt",
+]
+debug = ["defmt-rtt", "defmt"]
+
+[profile.release]
+debug = true
diff --git a/firmware/rust1-bootloader/README.md b/firmware/rust1-bootloader/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..064e8727336e8e35a5b2a9d549e7db2d26de3342
--- /dev/null
+++ b/firmware/rust1-bootloader/README.md
@@ -0,0 +1,17 @@
+# Bootloader for RP2040
+
+The bootloader uses `embassy-boot` to interact with the flash.
+
+# Usage
+
+Flashing the bootloader
+
+```
+cargo flash --release --chip RP2040
+```
+
+To debug, use `cargo run` and enable the debug feature flag
+
+``` rust
+cargo run --release --features debug
+```
diff --git a/firmware/rust1-bootloader/build.rs b/firmware/rust1-bootloader/build.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c201704ad6ada0fd0bc3b315785287e2f4fd609a
--- /dev/null
+++ b/firmware/rust1-bootloader/build.rs
@@ -0,0 +1,28 @@
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+
+fn main() {
+ // Put `memory.x` in our output directory and ensure it's
+ // on the linker search path.
+ let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
+ File::create(out.join("memory.x"))
+ .unwrap()
+ .write_all(include_bytes!("memory.x"))
+ .unwrap();
+ println!("cargo:rustc-link-search={}", out.display());
+
+ // By default, Cargo will re-run a build script whenever
+ // any file in the project changes. By specifying `memory.x`
+ // here, we ensure the build script is only re-run when
+ // `memory.x` is changed.
+ println!("cargo:rerun-if-changed=memory.x");
+
+ println!("cargo:rustc-link-arg-bins=--nmagic");
+ println!("cargo:rustc-link-arg-bins=-Tlink.x");
+ println!("cargo:rustc-link-arg-bins=-Tlink-rp.x");
+ if env::var("CARGO_FEATURE_DEFMT").is_ok() {
+ println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
+ }
+}
diff --git a/firmware/rust1-bootloader/memory.x b/firmware/rust1-bootloader/memory.x
new file mode 100644
index 0000000000000000000000000000000000000000..d6ef3846941260a5456ce3e5f23021ccc333777c
--- /dev/null
+++ b/firmware/rust1-bootloader/memory.x
@@ -0,0 +1,19 @@
+MEMORY
+{
+ /* NOTE 1 K = 1 KiBi = 1024 bytes */
+ BOOT2 : ORIGIN = 0x10000000, LENGTH = 0x100
+ FLASH : ORIGIN = 0x10000100, LENGTH = 24K
+ BOOTLOADER_STATE : ORIGIN = 0x10006000, LENGTH = 4K
+ ACTIVE : ORIGIN = 0x10007000, LENGTH = 512K
+ DFU : ORIGIN = 0x10087000, LENGTH = 516K
+ RAM : ORIGIN = 0x20000000, LENGTH = 256K
+}
+
+__bootloader_state_start = ORIGIN(BOOTLOADER_STATE) - ORIGIN(BOOT2);
+__bootloader_state_end = ORIGIN(BOOTLOADER_STATE) + LENGTH(BOOTLOADER_STATE) - ORIGIN(BOOT2);
+
+__bootloader_active_start = ORIGIN(ACTIVE) - ORIGIN(BOOT2);
+__bootloader_active_end = ORIGIN(ACTIVE) + LENGTH(ACTIVE) - ORIGIN(BOOT2);
+
+__bootloader_dfu_start = ORIGIN(DFU) - ORIGIN(BOOT2);
+__bootloader_dfu_end = ORIGIN(DFU) + LENGTH(DFU) - ORIGIN(BOOT2);
diff --git a/firmware/rust1-bootloader/src/main.rs b/firmware/rust1-bootloader/src/main.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8129591fa78b103abebfb92bb53bf7c5c29ab9df
--- /dev/null
+++ b/firmware/rust1-bootloader/src/main.rs
@@ -0,0 +1,50 @@
+#![no_std]
+#![no_main]
+
+use cortex_m_rt::{entry, exception};
+#[cfg(feature = "defmt")]
+use defmt_rtt as _;
+use embassy_boot_rp::*;
+use embassy_time::Duration;
+
+const FLASH_SIZE: usize = 2 * 1024 * 1024;
+
+#[entry]
+fn main() -> ! {
+ let p = embassy_rp::init(Default::default());
+
+ // Uncomment this if you are debugging the bootloader with debugger/RTT attached,
+ // as it prevents a hard fault when accessing flash 'too early' after boot.
+ /*
+ for i in 0..10000000 {
+ cortex_m::asm::nop();
+ }
+ */
+
+ let mut bl: BootLoader = BootLoader::default();
+ let flash = WatchdogFlash::<FLASH_SIZE>::start(p.FLASH, p.WATCHDOG, Duration::from_secs(8));
+ let mut flash = BootFlash::new(flash);
+ let start = bl.prepare(&mut SingleFlashConfig::new(&mut flash));
+ core::mem::drop(flash);
+
+ unsafe { bl.load(start) }
+}
+
+#[no_mangle]
+#[cfg_attr(target_os = "none", link_section = ".HardFault.user")]
+unsafe extern "C" fn HardFault() {
+ cortex_m::peripheral::SCB::sys_reset();
+}
+
+#[exception]
+unsafe fn DefaultHandler(_: i16) -> ! {
+ const SCB_ICSR: *const u32 = 0xE000_ED04 as *const u32;
+ let irqn = core::ptr::read_volatile(SCB_ICSR) as u8 as i16 - 16;
+
+ panic!("DefaultHandler #{:?}", irqn);
+}
+
+#[panic_handler]
+fn panic(_info: &core::panic::PanicInfo) -> ! {
+ cortex_m::asm::udf();
+}