From 861a63dbe31f8c1062bbc9a7eca012370ac26d76 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 23 Jun 2024 09:13:43 +0200
Subject: Update `embedded-hal-bus` to 0.2 and fix `portable-atomic` features

---
 xtask/src/argument_parsing.rs | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'xtask/src/argument_parsing.rs')

diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs
index 14920fd..8707ec5 100644
--- a/xtask/src/argument_parsing.rs
+++ b/xtask/src/argument_parsing.rs
@@ -73,30 +73,39 @@ impl Package {
                     ][..]
                 } else {
                     &[
-                        "cortex-m-systick,portable-atomic/critical-section",
-                        "cortex-m-systick,systick-64bit,portable-atomic/critical-section",
-                        "rp2040,portable-atomic/critical-section",
-                        "nrf52805,portable-atomic/critical-section",
-                        "nrf52810,portable-atomic/critical-section",
-                        "nrf52811,portable-atomic/critical-section",
-                        "nrf52832,portable-atomic/critical-section",
-                        "nrf52833,portable-atomic/critical-section",
-                        "nrf52840,portable-atomic/critical-section",
-                        "nrf5340-app,portable-atomic/critical-section",
-                        "nrf5340-net,portable-atomic/critical-section",
-                        "nrf9160,portable-atomic/critical-section",
-                        "imxrt_gpt1,imxrt_gpt2,imxrt-ral/imxrt1062,portable-atomic/critical-section",
-                        "stm32_tim2,stm32_tim3,stm32_tim4,stm32_tim5,stm32_tim15,stm32h725ag,portable-atomic/critical-section",
+                        "cortex-m-systick",
+                        "cortex-m-systick,systick-64bit",
+                        "rp2040",
+                        "nrf52805",
+                        "nrf52810",
+                        "nrf52811",
+                        "nrf52832",
+                        "nrf52833",
+                        "nrf52840",
+                        "nrf5340-app",
+                        "nrf5340-net",
+                        "nrf9160",
+                        "imxrt_gpt1,imxrt_gpt2,imxrt-ral/imxrt1062",
+                        "stm32_tim2,stm32_tim3,stm32_tim4,stm32_tim5,stm32_tim15,stm32h725ag",
                     ][..]
                 };
 
                 features
                     .iter()
-                    .map(ToString::to_string)
+                    .map(|&s| {
+                        if matches!(backend, Backends::Thumbv6) {
+                            format!("{s},portable-atomic/critical-section")
+                        } else {
+                            s.to_string()
+                        }
+                    })
                     .map(Some)
                     .chain(std::iter::once(None))
                     .collect()
             }
+            Package::RticSync if matches!(backend, Backends::Thumbv6) => {
+                vec![Some("portable-atomic/critical-section".into())]
+            }
             _ => vec![None],
         }
     }
-- 
cgit v1.2.3