From 1abaea28cddd28127d57c958f123c838d7c4fc5f Mon Sep 17 00:00:00 2001
From: Simon Renblad <srenblad@m-labs.hk>
Date: Fri, 24 Jan 2025 18:13:46 +0800
Subject: [PATCH] various, split later

---
 .cargo/config                 | 4 +++-
 Cargo.toml                    | 1 +
 armv7-none-eabihf.json        | 2 +-
 experiments/src/main.rs       | 1 +
 flake.nix                     | 2 +-
 libboard_zynq/src/sdio/mod.rs | 1 -
 libconfig/src/sd_reader.rs    | 1 -
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index 61f32b3..1edf549 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,9 +1,11 @@
 [target.armv7-none-eabihf]
 rustflags = [
   "-C", "link-arg=-Tlink.x",
-  "-C", "target-feature=+a9,+armv7-a,+neon",
   "-C", "target-cpu=cortex-a9",
 ]
 
 [build]
 target = "armv7-none-eabihf.json"
+
+[future-incompat-report]
+frequency = "never"
diff --git a/Cargo.toml b/Cargo.toml
index 8f18210..bbdcf8c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ members = [
   "experiments",
   "szl",
 ]
+resolver = "2"
 
 [profile.release]
 panic = "abort"
diff --git a/armv7-none-eabihf.json b/armv7-none-eabihf.json
index 6062f98..6f07755 100644
--- a/armv7-none-eabihf.json
+++ b/armv7-none-eabihf.json
@@ -4,7 +4,7 @@
   "emit-debug-gdb-scripts": false,
   "env": "",
   "executables": true,
-  "features": "+v7,+vfp3,-d32,+thumb2,-neon",
+  "features": "+v7,+vfp3,-d32,+thumb2,+neon,+a9,+armv7-a",
   "is-builtin": false,
   "linker": "rust-lld",
   "linker-flavor": "ld.lld",
diff --git a/experiments/src/main.rs b/experiments/src/main.rs
index 535ecc1..616fde2 100644
--- a/experiments/src/main.rs
+++ b/experiments/src/main.rs
@@ -7,6 +7,7 @@ extern crate alloc;
 
 use alloc::collections::BTreeMap;
 use core::arch::asm;
+use::core::ptr::addr_of_mut;
 use libasync::{
     delay,
     smoltcp::{Sockets, TcpStream},
diff --git a/flake.nix b/flake.nix
index 1599a8b..9e79b0b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
     let
       pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import rust-overlay) crosspkgs-overlay ]; };
       
-      rust = pkgs.rust-bin.nightly."2024-06-07".default.override {
+      rust = pkgs.rust-bin.nightly."2024-04-06".default.override {
         extensions = [ "rust-src" ];
         targets = [ ];
       };
diff --git a/libboard_zynq/src/sdio/mod.rs b/libboard_zynq/src/sdio/mod.rs
index f0025dc..f770356 100644
--- a/libboard_zynq/src/sdio/mod.rs
+++ b/libboard_zynq/src/sdio/mod.rs
@@ -9,7 +9,6 @@ use super::time::Milliseconds;
 use embedded_hal::timer::CountDown;
 use libregister::{RegisterR, RegisterRW, RegisterW};
 use log::{trace, debug};
-use nb;
 
 /// Basic SDIO Struct with common low-level functions.
 pub struct Sdio {
diff --git a/libconfig/src/sd_reader.rs b/libconfig/src/sd_reader.rs
index 5254a07..eb50bd3 100644
--- a/libconfig/src/sd_reader.rs
+++ b/libconfig/src/sd_reader.rs
@@ -1,5 +1,4 @@
 use core_io::{BufRead, Error, ErrorKind, Read, Result as IoResult, Seek, SeekFrom, Write};
-use fatfs;
 use libboard_zynq::sdio::{sd_card::SdCard, CmdTransferError};
 use log::debug;
 use alloc::vec::Vec;