Updated to latest experimental embedded-sdmmc.

Author: jonathanpallant

Cargo.toml

@@ -12,19 +12,16 @@ repository = "https://github.com/neotron-compute/Neotron-OS"
 name = "flash1002"
 test = false
 bench = false
-required-features = ["defmt-log"]
 
 [[bin]]
 name = "flash0802"
 test = false
 bench = false
-required-features = ["defmt-log"]
 
 [[bin]]
 name = "flash0002"
 test = false
 bench = false
-required-features = ["defmt-log"]
 
 [lib]
 crate-type = ["rlib", "cdylib"]
@@ -48,8 +45,4 @@ postcard = "0.5"
 serde = { version = "1.0", default-features = false }
 menu = "0.3"
 chrono = { version = "0.4", default-features = false }
-embedded-sdmmc = { git = "https://github.com/rust-embedded-community/embedded-sdmmc-rs.git", default-features = false }
-
-[features]
-native-log = ["embedded-sdmmc/log"]
-defmt-log = ["embedded-sdmmc/defmt-log"]
+embedded-sdmmc = { git = "https://github.com/rust-embedded-community/embedded-sdmmc-rs.git", branch="more-api-cleanups", default-features = false }

README.md

@@ -34,7 +34,7 @@ three different binaries:
 ```console
 $ git clone https://github.com/neotron-compute/Neotron-OS.git
 $ cd Neotron-OS
-$ cargo build --target thumbv6m-none-eabi --release --bins --features=defmt-log
+$ cargo build --target thumbv6m-none-eabi --release --bins
 $ ls ./target/thumbv6m-none-eabi/release/flash*02
 ./target/thumbv6m-none-eabi/release/flash0002 ./target/thumbv6m-none-eabi/release/flash0802 ./target/thumbv6m-none-eabi/release/flash1002
 ```
@@ -44,7 +44,7 @@ Your BIOS should tell you which one you want and how to load it onto your system
 You can also build a *shared object* to load into a Windows/Linux/macOS application.
 
 ```console
-$ cargo build --lib --features=native-log
+$ cargo build --lib
 $ ls ./target/debug/*.so
 ./target/debug/libneotron_os.so
 ```

build.sh

@@ -11,15 +11,15 @@ for TARGET_ARCH in thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi; do
   echo "TARGET is ${TARGET_ARCH}"
   for BINARY in flash0002 flash0802 flash1002; do
     echo "BINARY is ${BINARY}"
-    cargo build --verbose --release --target=${TARGET_ARCH} --bin ${BINARY} --features=defmt-log
+    cargo build --verbose --release --target=${TARGET_ARCH} --bin ${BINARY}
     # objcopy would do the build for us first, but it doesn't have good build output
-    cargo objcopy --verbose --release --target=${TARGET_ARCH} --bin ${BINARY} --features=defmt-log -- -O binary ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.bin
+    cargo objcopy --verbose --release --target=${TARGET_ARCH} --bin ${BINARY} -- -O binary ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.bin
     # Keep the ELF file too (for debugging)
     cp ./target/${TARGET_ARCH}/release/${BINARY} ${RELEASE_DIR}/${TARGET_ARCH}-${BINARY}-libneotron_os.elf
   done
 done
 
 # Build the host version
 echo "Building HOST"
-cargo build --verbose --lib --release --target=x86_64-unknown-linux-gnu --features=native-log
+cargo build --verbose --lib --release --target=x86_64-unknown-linux-gnu
 cp ./target/x86_64-unknown-linux-gnu/release/libneotron_os.so ${RELEASE_DIR}/x86_64-unknown-linux-gnu-libneotron_os.so