morgan
/
zynq-rs
forked from M-Labs/zynq-rs
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: morgan:be672ab662d8134ee11412a651864824f6483d4a
Branches Tags
morgan:master
morgan:rename_abort
morgan:vector_fix
morgan:fiq_issue
morgan:esavkin/reboot_support
M-Labs:master
..
compare: morgan:c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054
Branches Tags
morgan:master
morgan:rename_abort
morgan:vector_fix
morgan:fiq_issue
morgan:esavkin/reboot_support
M-Labs:master

No commits in common. "be672ab662d8134ee11412a651864824f6483d4a" and "c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054" have entirely different histories.
be672ab662 ... c15b54f92b

4 changed files with 11 additions and 6 deletions
Show Stats Expand all files Collapse all files

12
flake.lock
View File

@ -3,11 +3,11 @@
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1695805681, "lastModified": 1690536331,
"narHash": "sha256-1ElPLD8eFfnuIk0G52HGGpRtQZ4QPCjChRlEOfkZ5ro=", "narHash": "sha256-aRIf2FB2GTdfF7gl13WyETmiV/J7EhBGkSWXfZvlxcA=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "6eabade97bc28d707a8b9d82ad13ef143836736e", "rev": "db89c8707edcffefcd8e738459d511543a339ff5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697655685, "lastModified": 1691328192,
"narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", "narHash": "sha256-w59N1zyDQ7SupfMJLFvtms/SIVbdryqlw5AS4+DiH+Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", "rev": "61676e4dcfeeb058f255294bcb08ea7f3bc3ce56",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
libboard_zynq/src/error_led.rs
View File

@ -18,6 +18,8 @@ impl ErrorLED {
.pullup(true) .pullup(true)
.disable_rcvr(true) .disable_rcvr(true)
); );
// reset
slcr.gpio_rst_ctrl.reset_gpio();
}); });
Self::error_led_common(0xFFFF - 0x0080) Self::error_led_common(0xFFFF - 0x0080)

1
libboard_zynq/src/eth/mod.rs
View File

@ -508,6 +508,7 @@ impl PhyRst {
.pullup(true) .pullup(true)
.disable_rcvr(true) .disable_rcvr(true)
); );
slcr.gpio_rst_ctrl.reset_gpio();
}); });
Self::eth_reset_common(0xFFFF - 0x8000) Self::eth_reset_common(0xFFFF - 0x8000)
} }

2
libboard_zynq/src/i2c/mod.rs
View File

@ -53,6 +53,8 @@ impl I2c {
.pullup(false) .pullup(false)
.disable_rcvr(true) .disable_rcvr(true)
); );
// Reset
slcr.gpio_rst_ctrl.reset_gpio();
}); });
Self::i2c_common(0xFFFF - 0x000C, 0xFFFF - 0x0002) Self::i2c_common(0xFFFF - 0x000C, 0xFFFF - 0x0002)