M-Labs
/
zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests 1 Releases Wiki Activity

Compare commits

merge into: M-Labs:master
Branches Tags
M-Labs:master
abdul124:master
...
pull from: abdul124:master
Branches Tags
abdul124:master
M-Labs:master

15 Commits
master ... master

Author SHA1 Message Date
= d49d66f150 switching to forked core_io 2024-07-21 14:42:38 +08:00
= 4b456ac054 fix hash 2024-07-21 14:33:10 +08:00
= 1f8918d852 replace fatfs 2024-07-21 14:30:30 +08:00
= 86013384f6 remove core_io dependency from fatfs 2024-07-21 14:09:08 +08:00
abdul124 ea0e1cf3ca WIP 2024-07-19 18:10:23 +08:00
abdul124 f6e82db00b WIP 2024-07-19 18:06:49 +08:00
abdul124 f4b7eb13e7 WIP 2024-07-19 17:49:07 +08:00
abdul124 65dae32acc WIP 2024-07-19 17:18:56 +08:00
abdul124 4f48238624 Update flake.nix 2024-07-19 17:02:41 +08:00
abdul124 7da03ee6e1 Update Cargo.lock 2024-07-19 17:01:57 +08:00
abdul124 6b4e6a68bf use forked core_io 2024-07-19 16:53:45 +08:00
abdul124 3e23b6720b use forked core_io 2024-07-19 15:49:49 +08:00
abdul124 4c5c4a0e8b Update .cargo/config 2024-07-19 10:54:28 +08:00
abdul124 4200b7caa1 Update libcortex_a9/src/lib.rs 2024-07-19 10:27:59 +08:00
abdul124 41fef76da2 Update libcortex_a9/src/lib.rs 2024-07-19 10:26:51 +08:00
7 changed files with 16 additions and 12 deletions
Show Stats Expand all files Collapse all files

1
.cargo/config
View File

@ -3,6 +3,7 @@ rustflags = [
"-C", "link-arg=-Tlink.x", "-C", "link-arg=-Tlink.x",
"-C", "target-feature=a9,armv7-a,neon", "-C", "target-feature=a9,armv7-a,neon",
"-C", "target-cpu=cortex-a9", "-C", "target-cpu=cortex-a9",
"-Zcrate-attr=feature(const_fn)"
] ]
[build] [build]

6
Cargo.lock generated
View File

@ -39,8 +39,7 @@ checksum = "3748f82c7d366a0b4950257d19db685d4958d2fa27c6d164a3f069fec42b748b"
[[package]] [[package]]
name = "core_io" name = "core_io"
version = "0.1.20210325" version = "0.1.20210325"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://git.m-labs.hk/abdul124/core_io?rev=998b1e9#998b1e99907faf8de0381ea9fa54fe649ce6bfdd"
checksum = "97f8932064288cc79feb4d343a399d353a6f6f001e586ece47fe518a9e8507df"
dependencies = [ dependencies = [
"rustc_version", "rustc_version",
] ]
@ -71,8 +70,7 @@ dependencies = [
[[package]] [[package]]
name = "fatfs" name = "fatfs"
version = "0.3.5" version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://git.m-labs.hk/abdul124/fatfs?rev=05e9feb#05e9feb52c1c4415b27847ac2ed2303682850f97"
checksum = "e18f80a87439240dac45d927fd8f8081b6f1e34c03e97271189fa8a8c2e96c8f"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"byteorder", "byteorder",

6
flake.lock
View File

@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720386169, "lastModified": 1721226092,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "rev": "c716603a63aca44f39bef1986c13402167450e0a",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -114,7 +114,13 @@
src = builtins.filterSource (path: type: src = builtins.filterSource (path: type:
baseNameOf path != "target" baseNameOf path != "target"
) ./.; ) ./.;
cargoLock = { lockFile = ./Cargo.lock; }; cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"core_io-0.1.20210325" = "sha256-XM7Y7EeItmNQSVaVLZqpRPSyLj6ZMskUvdYxvmuo1ww=";
"fatfs-0.3.5" = "sha256-jCRCZ+QNkRPSPtWrod+6UuX2ULPYTWo77aLegco8Rxg=";
};
};
nativeBuildInputs = [ cargo-xbuild llvmPackages_11.clang-unwrapped ]; nativeBuildInputs = [ cargo-xbuild llvmPackages_11.clang-unwrapped ];
buildPhase = '' buildPhase = ''

4
libconfig/Cargo.toml
View File

@ -6,8 +6,8 @@ edition = "2018"
[dependencies] [dependencies]
libboard_zynq = { path = "../libboard_zynq" } libboard_zynq = { path = "../libboard_zynq" }
core_io = { version = "0.1", features = ["collections"] } core_io = { git = "https://git.m-labs.hk/abdul124/core_io.git", rev = "998b1e9", features = ["collections"] }
fatfs = { version = "0.3", features = ["core_io"], default-features = false } fatfs = { git = "https://git.m-labs.hk/abdul124/fatfs.git", rev = "05e9feb", features = ["core_io"], default-features = false }
log = "0.4" log = "0.4"
[features] [features]

1
libcortex_a9/src/lib.rs
View File

@ -1,7 +1,6 @@
#![no_std] #![no_std]
#![feature(llvm_asm, global_asm)] #![feature(llvm_asm, global_asm)]
#![feature(never_type)] #![feature(never_type)]
#![feature(const_fn)]
extern crate alloc; extern crate alloc;

2
szl/Cargo.toml
View File

@ -15,7 +15,7 @@ default = ["target_zc706"]
[dependencies] [dependencies]
log = "0.4" log = "0.4"
byteorder = { version = "1.3", default-features = false } byteorder = { version = "1.3", default-features = false }
core_io = { version = "0.1", features = ["collections"] } core_io = { git = "https://git.m-labs.hk/abdul124/core_io.git", rev = "998b1e9", features = ["collections"] }
libboard_zynq = { path = "../libboard_zynq" } libboard_zynq = { path = "../libboard_zynq" }
libsupport_zynq = { path = "../libsupport_zynq" } libsupport_zynq = { path = "../libsupport_zynq" }