Merge branch 'main' of github.com:betrusted-io/xous-core into main

svd2utra/src/generate.rs

@@ -1,4 +1,3 @@
-use convert_case::{Case, Casing};
 use quick_xml::events::{attributes::Attribute, Event};
 use quick_xml::Reader;
 use std::io::{BufRead, BufReader, Read, Write};
@@ -893,25 +892,6 @@ pub mod utra {
     for peripheral in peripherals {
         writeln!(out)?;
         writeln!(out, "    pub mod {} {{", peripheral.name.to_lowercase())?;
-        writeln!(
-            out,
-            "        // this enum is vestigal, and currently not used by anything"
-        )?;
-        writeln!(out, "        #[derive(Debug, Copy, Clone)]")?;
-        writeln!(
-            out,
-            "        pub enum {}Offset {{",
-            peripheral.name.to_case(Case::UpperCamel)
-        )?;
-        for register in &peripheral.registers {
-            writeln!(
-                out,
-                "            {} = {},",
-                register.name.to_case(Case::UpperCamel),
-                register.offset
-            )?;
-        }
-        writeln!(out, "        }}")?;
         writeln!(
             out,
             "        pub const {}_NUMREGS: usize = {};",

utralib/Cargo.toml

@@ -46,5 +46,8 @@ precursor = []
 hosted = []
 renode = []
 
+# ATSAMA5D27 ARMv7A SoC
+atsama5d27 = []
+
 # Specify a Precusor default so that we can pass packaging CI tests.
 default = ["precursor-70190e2", "precursor"]

utralib/build.rs

@@ -21,7 +21,7 @@ macro_rules! count_enabled_features {
 }
 
 /// Helper macro that returns a compile-time error if multiple or none of the
-/// features of some caterogy are defined.
+/// features of some category are defined.
 ///
 /// # Example
 ///
@@ -83,7 +83,7 @@ fn main() {
     // This script retains the use of an explicit "hosted" flag because we want to catch
     // unintentional build system misconfigurations that meant to build for a target other
     // than "hosted", rather than just falling back silently to defaults.
-    allow_single_target_feature!("precursor", "hosted", "renode");
+    allow_single_target_feature!("precursor", "hosted", "renode", "atsama5d27");
 
     #[cfg(feature = "precursor")]
     allow_single_gitrev_feature!(
@@ -125,6 +125,11 @@ fn main() {
     #[cfg(feature = "precursor-70190e2")]
     let generated_filename = "src/generated/precursor_70190e2.rs";
 
+    #[cfg(feature = "atsama5d27")]
+    let svd_filename = "atsama5d/ATSAMA5D27.svd";
+    #[cfg(feature = "atsama5d27")]
+    let generated_filename = "src/generated/atsama5d27.rs";
+
     // ----- control file generation and rebuild sequence -----
     // check and see if the configuration has changed since the last build. This should be
     // passed by the build system (e.g. xtask) if the feature is used.

utralib/src/generated.rs

@@ -31,6 +31,11 @@ mod precursor_70190e2;
 #[cfg(feature="precursor-70190e2")]
 pub use precursor_70190e2::*;
 
+#[cfg(feature = "atsama5d27")]
+mod atsama5d27;
+#[cfg(feature = "atsama5d27")]
+pub use atsama5d27::*;
+
 // Hosted mode includes nothing, as it relies on the abstract host
 // architecture for I/O; so this file is empty when the "hosted"
 // configuration is selected and there are no corresponding "hosted"