Merge pull request #22 from almindor/redv

add SparkFun RED-V board support

Author: almindor

Cargo.toml

@@ -18,6 +18,7 @@ nb = "0.1.2"
 [features]
 board-hifive1 = []
 board-hifive1-revb = ["e310x-hal/g002"]
+board-redv = ["e310x-hal/g002"]
 board-lofive = []
 board-lofive-r1 = ["e310x-hal/g002"]
 

README.md

@@ -6,6 +6,14 @@
 
 > Board support crate for HiFive1 and LoFive boards
 
+## Supported Boards
+
+`hifive1` - use feature `board-hifive1`
+`hifive1-revb` - use feature `board-hifive1-revb`
+`redv` - use feature `board-redv`
+`lofive` - use feature `board-lofive`
+`lofive-r1` - use feature `board-lofive-r1`
+
 ## [Documentation](https://docs.rs/crate/hifive1)
 
 ## License

build.rs

@@ -1,18 +1,20 @@
-use std::{env, fs};
 use std::path::PathBuf;
+use std::{env, fs};
 
 fn main() {
     // Put the memory definitions somewhere the linker can find it
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     println!("cargo:rustc-link-search={}", out_dir.display());
 
-    let boards: Vec<_> = env::vars().filter_map(|(key, _value)| {
-        if key.starts_with("CARGO_FEATURE_BOARD") {
-            Some(key[20..].to_ascii_lowercase())  // Strip 'CARGO_FEATURE_BOARD_'
-        } else {
-            None
-        }
-    }).collect();
+    let boards: Vec<_> = env::vars()
+        .filter_map(|(key, _value)| {
+            if key.starts_with("CARGO_FEATURE_BOARD") {
+                Some(key[20..].to_ascii_lowercase()) // Strip 'CARGO_FEATURE_BOARD_'
+            } else {
+                None
+            }
+        })
+        .collect();
 
     if boards.is_empty() {
         panic!("No board features selected");
@@ -28,7 +30,7 @@ fn main() {
             fs::copy("memory-hifive1.x", out_dir.join("hifive1-memory.x")).unwrap();
             println!("cargo:rerun-if-changed=memory-hifive1.x");
         }
-        "hifive1_revb" => {
+        "hifive1_revb" | "redv" => {
             fs::copy("memory-hifive1-revb.x", out_dir.join("hifive1-memory.x")).unwrap();
             println!("cargo:rerun-if-changed=memory-hifive1-revb.x");
         }

ci/script.sh

@@ -4,5 +4,6 @@ set -euxo pipefail
 
 cargo check --target $TARGET --features 'board-hifive1'
 cargo check --target $TARGET --features 'board-hifive1-revb'
+cargo check --target $TARGET --features 'board-redv'
 cargo check --target $TARGET --features 'board-lofive'
 cargo check --target $TARGET --features 'board-lofive-r1'

src/clock.rs

@@ -1,19 +1,25 @@
 //! Board-specific clock configuration
 
 use e310x_hal::{
-    e310x::{PRCI, AONCLK},
-    clock::{Clocks, PrciExt, AonExt},
+    clock::{AonExt, Clocks, PrciExt},
+    e310x::{AONCLK, PRCI},
     time::Hertz,
 };
 
-#[cfg(any(feature = "board-hifive1", feature = "board-hifive1-revb"))]
+#[cfg(any(
+    feature = "board-hifive1",
+    feature = "board-hifive1-revb",
+    feature = "board-redv"
+))]
 /// Configures clock generation system.
 ///
 /// For HiFive1 and HiFive1 Rev B boards external oscillators are enabled for
 /// both high-frequency and low-frequency clocks.
 pub fn configure(prci: PRCI, aonclk: AONCLK, target_coreclk: Hertz) -> Clocks {
     let coreclk = prci.constrain();
-    let coreclk = coreclk.use_external(Hertz(16_000_000)).coreclk(target_coreclk);
+    let coreclk = coreclk
+        .use_external(Hertz(16_000_000))
+        .coreclk(target_coreclk);
 
     let aonclk = aonclk.constrain();
     let aonclk = aonclk.use_external(Hertz(32_768));
@@ -28,7 +34,9 @@ pub fn configure(prci: PRCI, aonclk: AONCLK, target_coreclk: Hertz) -> Clocks {
 /// high-frequency clock. For low-frequency clock internal oscillator is used.
 pub fn configure(prci: PRCI, aonclk: AONCLK, target_coreclk: Hertz) -> Clocks {
     let coreclk = prci.constrain();
-    let coreclk = coreclk.use_external(Hertz(16_000_000)).coreclk(target_coreclk);
+    let coreclk = coreclk
+        .use_external(Hertz(16_000_000))
+        .coreclk(target_coreclk);
 
     let aonclk = aonclk.constrain();
 

src/flash.rs

@@ -1,7 +1,7 @@
 //! On-board SPI Flash
 
-use e310x_hal::e310x::QSPI0;
 use e310x_hal::clock::Clocks;
+use e310x_hal::e310x::QSPI0;
 
 /// Configure SPI Flash interface to maximum supported speed
 #[inline(always)]