Remove the mcu-boot feature from esp32c3-hal (#938)

* Remove the `mcu-boot` feature from `esp32c3-hal`

* Update `CHANGELOG.md`

.github/workflows/ci.yml

@@ -177,12 +177,8 @@ jobs:
 
       # Perform a full build initially to verify that the examples not only
       # build, but also link successfully.
-      # We also use this as an opportunity to verify that the examples link
-      # for each supported image format.
       - name: build esp32c3-hal (no features)
         run: cd esp32c3-hal/ && cargo +nightly build --examples
-      - name: build esp32c3-hal (mcu-boot)
-        run: cd esp32c3-hal/ && cargo +nightly build --examples --features=mcu-boot
       # Subsequent steps can just check the examples instead, as we're already
       # confident that they link.
       - name: check esp32c3-hal (common features)

CHANGELOG.md

@@ -31,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Removed the `mcu-boot` feature from `esp32c3-hal` (#938)
+
 ### Breaking
 - Direct boot support has been removed (#903).
 - `Spi::new`/`Spi::new_half_duplex` takes no gpio pin now, instead you need to call `with_pins` to setup those (#901).

esp32c3-hal/Cargo.toml

@@ -63,7 +63,6 @@ direct-vectoring     = ["esp-hal-common/direct-vectoring"]
 eh1                  = ["esp-hal-common/eh1"]
 interrupt-preemption = ["esp-hal-common/interrupt-preemption"]
 log                  = ["esp-hal-common/log", "esp-println/log"]
-mcu-boot             = []
 rt                   = []
 ufmt                 = ["esp-hal-common/ufmt"]
 vectored             = ["esp-hal-common/vectored"]

esp32c3-hal/build.rs

@@ -1,6 +1,5 @@
 use std::{env, error::Error, fs, path::PathBuf};
 
-#[cfg(not(feature = "mcu-boot"))]
 fn main() -> Result<(), Box<dyn Error>> {
     // Put the linker script somewhere the linker can find it
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
@@ -21,26 +20,3 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     Ok(())
 }
-
-#[cfg(feature = "mcu-boot")]
-fn main() -> Result<(), Box<dyn Error>> {
-    // Put the linker script somewhere the linker can find it
-    let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    println!("cargo:rustc-link-search={}", out.display());
-
-    fs::copy("ld/mb-esp32c3-memory.x", out.join("memory.x"))?;
-    fs::copy("ld/mb-esp32c3-link.x", out.join("esp32c3-link.x"))?;
-    fs::copy("ld/mb-riscv-link.x", out.join("riscv-link.x"))?;
-    fs::copy("ld/mb-linkall.x", out.join("linkall.x"))?;
-
-    fs::copy("ld/rom-functions.x", out.join("rom-functions.x"))?;
-
-    // Only re-run the build script when memory.x is changed,
-    // instead of when any part of the source code changes.
-    println!("cargo:rerun-if-changed=ld/memory.x");
-
-    #[cfg(feature = "defmt")]
-    println!("cargo:rustc-link-arg=-Tdefmt.x");
-
-    Ok(())
-}