From f6c5f039c85904d9e93befa6db3e9e1a01d3a5fd Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Fri, 30 Jul 2021 14:06:10 -0400
Subject: [PATCH 1/6] Emit a default memory.x alongside device.x from metapac.

---
 embassy-stm32/src/lib.rs              |  4 ++-
 examples/stm32f4/build.rs             | 31 ---------------------
 examples/stm32f4/memory.x             |  7 -----
 examples/stm32h7/build.rs             | 21 --------------
 examples/stm32h7/memory.x             |  5 ----
 stm32-data                            |  2 +-
 stm32-metapac-gen/src/assets/build.rs |  8 ++++++
 stm32-metapac-gen/src/lib.rs          | 40 +++++++++++++++++++++++++--
 8 files changed, 50 insertions(+), 68 deletions(-)
 delete mode 100644 examples/stm32f4/build.rs
 delete mode 100644 examples/stm32f4/memory.x
 delete mode 100644 examples/stm32h7/build.rs
 delete mode 100644 examples/stm32h7/memory.x

diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index 89fd8644..b5fe29d6 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -39,7 +39,9 @@ pub mod eth;
 pub mod exti;
 #[cfg(i2c)]
 pub mod i2c;
-#[cfg(pwr)]
+
+// until we have all PWR covered.
+#[cfg(all(any(pwr_h7, pwr_h7smps), pwr))]
 pub mod pwr;
 #[cfg(rng)]
 pub mod rng;
diff --git a/examples/stm32f4/build.rs b/examples/stm32f4/build.rs
deleted file mode 100644
index d534cc3d..00000000
--- a/examples/stm32f4/build.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-//! This build script copies the `memory.x` file from the crate root into
-//! a directory where the linker can always find it at build time.
-//! For many projects this is optional, as the linker always searches the
-//! project root directory -- wherever `Cargo.toml` is. However, if you
-//! are using a workspace or have a more complicated build setup, this
-//! build script becomes required. Additionally, by requesting that
-//! Cargo re-run the build script whenever `memory.x` is changed,
-//! updating `memory.x` ensures a rebuild of the application with the
-//! new memory settings.
-
-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");
-}
diff --git a/examples/stm32f4/memory.x b/examples/stm32f4/memory.x
deleted file mode 100644
index f21e3257..00000000
--- a/examples/stm32f4/memory.x
+++ /dev/null
@@ -1,7 +0,0 @@
-MEMORY
-{
-  /* NOTE 1 K = 1 KiBi = 1024 bytes */
-  /* These values correspond to the STM32F429ZI */
-  FLASH : ORIGIN = 0x08000000, LENGTH = 2048K
-  RAM : ORIGIN = 0x20000000, LENGTH = 192K
-}
diff --git a/examples/stm32h7/build.rs b/examples/stm32h7/build.rs
deleted file mode 100644
index 555cdf68..00000000
--- a/examples/stm32h7/build.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-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");
-}
diff --git a/examples/stm32h7/memory.x b/examples/stm32h7/memory.x
deleted file mode 100644
index ef9485d1..00000000
--- a/examples/stm32h7/memory.x
+++ /dev/null
@@ -1,5 +0,0 @@
-MEMORY
-{
-  FLASH : ORIGIN = 0x08000000, LENGTH = 2048K
-  RAM : ORIGIN = 0x24000000, LENGTH = 384K
-}
diff --git a/stm32-data b/stm32-data
index 0ad27b2f..f36d629d 160000
--- a/stm32-data
+++ b/stm32-data
@@ -1 +1 @@
-Subproject commit 0ad27b2fd1126c6c9d9f4602d1331f5d82f4aa26
+Subproject commit f36d629d54840b8f76a89fbd1f179aa1c31702bc
diff --git a/stm32-metapac-gen/src/assets/build.rs b/stm32-metapac-gen/src/assets/build.rs
index c16bd640..13050315 100644
--- a/stm32-metapac-gen/src/assets/build.rs
+++ b/stm32-metapac-gen/src/assets/build.rs
@@ -9,6 +9,14 @@ fn main() {
         .unwrap()
         .to_ascii_lowercase();
 
+    // 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();
+
     #[cfg(feature = "rt")]
     println!("cargo:rustc-link-search=src/chips/{}", _chip_name);
 
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index f508b365..93b81116 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -19,11 +19,23 @@ pub struct Chip {
     pub family: String,
     pub line: String,
     pub cores: Vec<Core>,
-    pub flash: u32,
-    pub ram: u32,
+    pub flash: Memory,
+    pub ram: Memory,
     pub packages: Vec<Package>,
 }
 
+#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
+pub struct Memory {
+    pub bytes: u32,
+    pub regions: HashMap<String, MemoryRegion>,
+}
+
+#[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
+pub struct MemoryRegion {
+    pub base: u32,
+    pub bytes: Option<u32>,
+}
+
 #[derive(Debug, Eq, PartialEq, Clone, Deserialize)]
 pub struct Core {
     pub name: String,
@@ -636,6 +648,9 @@ pub fn gen(options: Options) {
             .unwrap()
             .write_all(device_x.as_bytes())
             .unwrap();
+
+        // generate default memory.x
+        gen_memory_x(&chip_dir, &chip);
     }
 
     for (module, version) in all_peripheral_versions {
@@ -674,6 +689,7 @@ pub fn gen(options: Options) {
         let re = Regex::new("# *! *\\[.*\\]").unwrap();
         let data = re.replace_all(&data, "");
         file.write_all(data.as_bytes()).unwrap();
+
     }
 
     // Generate src/lib_inner.rs
@@ -734,6 +750,7 @@ pub fn gen(options: Options) {
 
     // Generate build.rs
     fs::write(out_dir.join("build.rs"), include_bytes!("assets/build.rs")).unwrap();
+
 }
 
 fn bytes_find(haystack: &[u8], needle: &[u8]) -> Option<usize> {
@@ -741,3 +758,22 @@ fn bytes_find(haystack: &[u8], needle: &[u8]) -> Option<usize> {
         .windows(needle.len())
         .position(|window| window == needle)
 }
+
+fn gen_memory_x(out_dir: &PathBuf, chip: &Chip) {
+    let mut memory_x = String::new();
+
+    let flash_bytes = chip.flash.regions.get("BANK_1").unwrap().bytes.unwrap();
+    let flash_origin = chip.flash.regions.get("BANK_1").unwrap().base;
+
+    let ram_bytes = chip.ram.regions.get("SRAM").unwrap().bytes.unwrap();
+    let ram_origin = chip.ram.regions.get("SRAM").unwrap().base;
+
+    write!(memory_x, "MEMORY\n{{\n").unwrap();
+    write!(memory_x, "    FLASH : ORIGIN = 0x{:x}, LENGTH = {}\n", flash_origin, flash_bytes).unwrap();
+    write!(memory_x, "    RAM : ORIGIN = 0x{:x}, LENGTH = {}\n", ram_origin, ram_bytes).unwrap();
+    write!(memory_x, "}}").unwrap();
+
+    let mut file = File::create(out_dir.join("memory.x")).unwrap();
+    file.write_all( memory_x.as_bytes() ).unwrap();
+
+}

From 4da8ed471b28e7562920dede647072a944632dcc Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Fri, 30 Jul 2021 14:13:07 -0400
Subject: [PATCH 2/6] Fallback to total RAM or FLASH size if otherwise not
 present.

---
 stm32-metapac-gen/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index 93b81116..e63c35ec 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -762,10 +762,10 @@ fn bytes_find(haystack: &[u8], needle: &[u8]) -> Option<usize> {
 fn gen_memory_x(out_dir: &PathBuf, chip: &Chip) {
     let mut memory_x = String::new();
 
-    let flash_bytes = chip.flash.regions.get("BANK_1").unwrap().bytes.unwrap();
+    let flash_bytes = chip.flash.regions.get("BANK_1").unwrap().bytes.unwrap_or(chip.flash.bytes);
     let flash_origin = chip.flash.regions.get("BANK_1").unwrap().base;
 
-    let ram_bytes = chip.ram.regions.get("SRAM").unwrap().bytes.unwrap();
+    let ram_bytes = chip.ram.regions.get("SRAM").unwrap().bytes.unwrap_or(chip.ram.bytes);
     let ram_origin = chip.ram.regions.get("SRAM").unwrap().base;
 
     write!(memory_x, "MEMORY\n{{\n").unwrap();

From 71040d1f2cd672888560448e9aaa768b843b384d Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 2 Aug 2021 11:09:56 -0400
Subject: [PATCH 3/6] Update to latest stm32-data.

---
 stm32-data | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stm32-data b/stm32-data
index f36d629d..af0611ff 160000
--- a/stm32-data
+++ b/stm32-data
@@ -1 +1 @@
-Subproject commit f36d629d54840b8f76a89fbd1f179aa1c31702bc
+Subproject commit af0611ff9b29f2c0ab675a4f0e51d8241a4097f7

From 3a00a1dba7846f2c2639e35cc85490b2fbe8a0d9 Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 2 Aug 2021 11:34:41 -0400
Subject: [PATCH 4/6] Undo the pwr-guarding cfg.

---
 embassy-stm32/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index b5fe29d6..0567aa72 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -40,8 +40,7 @@ pub mod exti;
 #[cfg(i2c)]
 pub mod i2c;
 
-// until we have all PWR covered.
-#[cfg(all(any(pwr_h7, pwr_h7smps), pwr))]
+#[cfg(pwr)]
 pub mod pwr;
 #[cfg(rng)]
 pub mod rng;

From 5f9447abb4463a9659a184b3b62bc2da3a696096 Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 2 Aug 2021 13:21:30 -0400
Subject: [PATCH 5/6] Put the implicit memory.x behind a `memory_x` feature on
 embassy-stm32.

---
 embassy-stm32/Cargo.toml              | 1 +
 examples/stm32f4/Cargo.toml           | 2 +-
 examples/stm32h7/Cargo.toml           | 2 +-
 stm32-metapac-gen/src/assets/build.rs | 5 +++++
 stm32-metapac-gen/src/lib.rs          | 3 ++-
 stm32-metapac/Cargo.toml              | 1 +
 stm32-metapac/build.rs                | 8 ++++++++
 7 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index d94c9d52..65592b1d 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -42,6 +42,7 @@ defmt-warn = [ ]
 defmt-error = [ ]
 sdmmc-rs = ["embedded-sdmmc"]
 net = ["embassy-net", "vcell"]
+memory_x = ["stm32-metapac/memory_x"]
 
 # Reexport stm32-metapac at `embassy_stm32::pac`.
 # This is unstable because semver-minor (non-breaking) releases of embassy-stm32 may major-bump (breaking) the stm32-metapac version.
diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml
index 693dac54..eb88ecc1 100644
--- a/examples/stm32f4/Cargo.toml
+++ b/examples/stm32f4/Cargo.toml
@@ -19,7 +19,7 @@ defmt-error = []
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac"]  }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory_x"]  }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 
 defmt = "0.2.0"
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index 278ab6f6..081e45a6 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -19,7 +19,7 @@ defmt-error = []
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net"] }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory_x"] }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] }
 stm32-metapac = { path = "../../stm32-metapac", features = ["stm32h743zi"] }
diff --git a/stm32-metapac-gen/src/assets/build.rs b/stm32-metapac-gen/src/assets/build.rs
index 13050315..0fe7c65e 100644
--- a/stm32-metapac-gen/src/assets/build.rs
+++ b/stm32-metapac-gen/src/assets/build.rs
@@ -17,6 +17,11 @@ fn main() {
         //.write_all(include_bytes!("memory.x"))
         //.unwrap();
 
+    println!("HOWDY");
+
+    #[cfg(feature = "memory_x")]
+    println!("cargo:rustc-link-search=src/chips/{}/memory_x/", _chip_name);
+
     #[cfg(feature = "rt")]
     println!("cargo:rustc-link-search=src/chips/{}", _chip_name);
 
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index e63c35ec..5e0cc58d 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -773,7 +773,8 @@ fn gen_memory_x(out_dir: &PathBuf, chip: &Chip) {
     write!(memory_x, "    RAM : ORIGIN = 0x{:x}, LENGTH = {}\n", ram_origin, ram_bytes).unwrap();
     write!(memory_x, "}}").unwrap();
 
-    let mut file = File::create(out_dir.join("memory.x")).unwrap();
+    fs::create_dir_all(out_dir.join("memory_x")).unwrap();
+    let mut file = File::create(out_dir.join("memory_x").join("memory.x")).unwrap();
     file.write_all( memory_x.as_bytes() ).unwrap();
 
 }
diff --git a/stm32-metapac/Cargo.toml b/stm32-metapac/Cargo.toml
index 2e01d518..692acd8a 100644
--- a/stm32-metapac/Cargo.toml
+++ b/stm32-metapac/Cargo.toml
@@ -17,6 +17,7 @@ regex = "1.5.4"
 
 [features]
 rt = ["cortex-m-rt/device"]
+memory_x = []
 
 # BEGIN GENERATED FEATURES
 # Generated by gen_features.py. DO NOT EDIT.
diff --git a/stm32-metapac/build.rs b/stm32-metapac/build.rs
index b44d98f3..d922735a 100644
--- a/stm32-metapac/build.rs
+++ b/stm32-metapac/build.rs
@@ -27,5 +27,13 @@ fn main() {
         out_dir.display(),
         chip_name.to_ascii_lowercase()
     );
+
+    #[cfg(feature = "memory_x")]
+    println!(
+        "cargo:rustc-link-search={}/src/chips/{}/memory_x/",
+        out_dir.display(),
+        chip_name.to_ascii_lowercase()
+    );
+
     println!("cargo:rerun-if-changed=build.rs");
 }

From 63b32b39e10fb0677d0a980930dc83ee792cd5ca Mon Sep 17 00:00:00 2001
From: Bob McWhirter <bmcwhirt@redhat.com>
Date: Mon, 2 Aug 2021 13:29:06 -0400
Subject: [PATCH 6/6] Use an em bikeshed instead of an underscore bikeshed.

---
 embassy-stm32/Cargo.toml              |  2 +-
 examples/stm32f4/Cargo.toml           |  2 +-
 examples/stm32h7/Cargo.toml           |  2 +-
 stm32-metapac-gen/src/assets/build.rs | 12 +-----------
 stm32-metapac/Cargo.toml              |  2 +-
 stm32-metapac/build.rs                |  2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index 65592b1d..6f8691c3 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -42,7 +42,7 @@ defmt-warn = [ ]
 defmt-error = [ ]
 sdmmc-rs = ["embedded-sdmmc"]
 net = ["embassy-net", "vcell"]
-memory_x = ["stm32-metapac/memory_x"]
+memory-x = ["stm32-metapac/memory-x"]
 
 # Reexport stm32-metapac at `embassy_stm32::pac`.
 # This is unstable because semver-minor (non-breaking) releases of embassy-stm32 may major-bump (breaking) the stm32-metapac version.
diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml
index eb88ecc1..84b1e30e 100644
--- a/examples/stm32f4/Cargo.toml
+++ b/examples/stm32f4/Cargo.toml
@@ -19,7 +19,7 @@ defmt-error = []
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory_x"]  }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32f429zi", "unstable-pac", "memory-x"]  }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 
 defmt = "0.2.0"
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
index 081e45a6..8bc6781e 100644
--- a/examples/stm32h7/Cargo.toml
+++ b/examples/stm32h7/Cargo.toml
@@ -19,7 +19,7 @@ defmt-error = []
 [dependencies]
 embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-trace"] }
 embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features = ["defmt"] }
-embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory_x"] }
+embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "defmt-trace", "stm32h743zi", "net", "memory-x"] }
 embassy-hal-common = {version = "0.1.0", path = "../../embassy-hal-common" }
 embassy-net = { path = "../../embassy-net", default-features = false, features = ["defmt-debug", "defmt", "tcp", "medium-ethernet", "pool-16"] }
 stm32-metapac = { path = "../../stm32-metapac", features = ["stm32h743zi"] }
diff --git a/stm32-metapac-gen/src/assets/build.rs b/stm32-metapac-gen/src/assets/build.rs
index 0fe7c65e..4110fe48 100644
--- a/stm32-metapac-gen/src/assets/build.rs
+++ b/stm32-metapac-gen/src/assets/build.rs
@@ -9,17 +9,7 @@ fn main() {
         .unwrap()
         .to_ascii_lowercase();
 
-    // 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!("HOWDY");
-
-    #[cfg(feature = "memory_x")]
+    #[cfg(feature = "memory-x")]
     println!("cargo:rustc-link-search=src/chips/{}/memory_x/", _chip_name);
 
     #[cfg(feature = "rt")]
diff --git a/stm32-metapac/Cargo.toml b/stm32-metapac/Cargo.toml
index 692acd8a..fabd9566 100644
--- a/stm32-metapac/Cargo.toml
+++ b/stm32-metapac/Cargo.toml
@@ -17,7 +17,7 @@ regex = "1.5.4"
 
 [features]
 rt = ["cortex-m-rt/device"]
-memory_x = []
+memory-x = []
 
 # BEGIN GENERATED FEATURES
 # Generated by gen_features.py. DO NOT EDIT.
diff --git a/stm32-metapac/build.rs b/stm32-metapac/build.rs
index d922735a..ca964c9e 100644
--- a/stm32-metapac/build.rs
+++ b/stm32-metapac/build.rs
@@ -28,7 +28,7 @@ fn main() {
         chip_name.to_ascii_lowercase()
     );
 
-    #[cfg(feature = "memory_x")]
+    #[cfg(feature = "memory-x")]
     println!(
         "cargo:rustc-link-search={}/src/chips/{}/memory_x/",
         out_dir.display(),