Merge pull request #229 from embassy-rs/buildrs-macrotables

Use macrotables from build.rs

5 files changed, 9 insertions, 16 deletions

diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
index ee0ec1abf..a93fce41e 100644
--- a/embassy-stm32/Cargo.toml
+++ b/embassy-stm32/Cargo.toml
@@ -27,6 +27,7 @@ stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"
 cfg-if = "1.0.0"
 
 [build-dependencies]
+stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", default-features = false }
 serde = { version = "1.0.123", features = [ "derive" ]}
 serde_yaml = "0.8.15"
 
diff --git a/embassy-stm32/build.rs b/embassy-stm32/build.rs
index ef60a855a..df8af660b 100644
--- a/embassy-stm32/build.rs
+++ b/embassy-stm32/build.rs
@@ -23,10 +23,13 @@ fn main() {
         panic!("gen.py exited with {:?}", exit_code)
     }
 
-    for s in env::var("DEP_STM32_METAPAC_V0.1_CFGS").unwrap().split(",") {
-        println!("cargo:rustc-cfg={}", s);
-    }
-    println!("cargo:rerun-if-env-changed=DEP_STM32_METAPAC_V0.1_CFGS");
+    stm32_metapac::peripheral_versions!(
+        ($peri:ident, $version:ident) => {
+            println!("cargo:rustc-cfg={}", stringify!($peri));
+            println!("cargo:rustc-cfg={}_{}", stringify!($peri), stringify!($version));
+        };
+    );
+
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-changed=gen.py");
 }
diff --git a/embassy-stm32/src/clock.rs b/embassy-stm32/src/clock.rs
index 694ca666d..075b80118 100644
--- a/embassy-stm32/src/clock.rs
+++ b/embassy-stm32/src/clock.rs
@@ -79,7 +79,7 @@ impl<T: Instance> Clock<T> {
     // TODO: Temporary until clock code generation is in place
     pub fn start_tim2(&'static self) {
         cfg_if::cfg_if! {
-            if #[cfg(stm32l0)] {
+            if #[cfg(rcc_l0)] {
                 unsafe {
                     let rcc = crate::pac::RCC;
                     rcc.apb1enr()
diff --git a/stm32-metapac/Cargo.toml b/stm32-metapac/Cargo.toml
index 971d76956..e7f0b22e9 100644
--- a/stm32-metapac/Cargo.toml
+++ b/stm32-metapac/Cargo.toml
@@ -2,7 +2,6 @@
 name = "stm32-metapac"
 version = "0.1.0"
 edition = "2018"
-links = "stm32-metapac-v0.1"
 resolver = "2"
 
 [dependencies]
diff --git a/stm32-metapac/build.rs b/stm32-metapac/build.rs
index ef95f3313..083e06bfd 100644
--- a/stm32-metapac/build.rs
+++ b/stm32-metapac/build.rs
@@ -132,7 +132,6 @@ fn main() {
     };
 
     let mut peripheral_versions: HashMap<String, String> = HashMap::new();
-    let mut cfgs: HashSet<String> = HashSet::new();
     let mut pin_table: Vec<Vec<String>> = Vec::new();
     let mut interrupt_table: Vec<Vec<String>> = Vec::new();
     let mut peripherals_table: Vec<Vec<String>> = Vec::new();
@@ -148,8 +147,6 @@ fn main() {
     let gpio_base = chip.peripherals.get(&"GPIOA".to_string()).unwrap().address;
     let gpio_stride = 0x400;
 
-    cfgs.insert(chip.family.to_ascii_lowercase().replace("+", "plus"));
-
     for (name, p) in &chip.peripherals {
         let mut ir_peri = ir::Peripheral {
             name: name.clone(),
@@ -176,8 +173,6 @@ fn main() {
                 peripheral_pins_table.push(row);
             }
 
-            cfgs.insert(bi.module.clone());
-            cfgs.insert(format!("{}_{}", bi.module, bi.version));
             let mut peripheral_row = Vec::new();
             peripheral_row.push(bi.module.clone());
             peripheral_row.push(name.clone());
@@ -319,9 +314,4 @@ fn main() {
         .unwrap();
     println!("cargo:rustc-link-search={}", out.display());
     println!("cargo:rerun-if-changed=build.rs");
-
-    println!(
-        "cargo:cfgs={}",
-        cfgs.into_iter().collect::<Vec<_>>().join(",")
-    );
 }