M-Labs
/
artiq-zynq
10
1
Fork 19
Code Issues 14 Pull Requests 1 Releases Wiki Activity

Compare commits

base: M-Labs:a71ee143acab4ff2d72b27adb5487df3775e1f96
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
M-Labs:release-6
..
compare: M-Labs:53d931dccc9246571ba6dd09e35c487b7c0c5e05
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
M-Labs:release-6

2 Commits
a71ee143ac ... 53d931dccc

Author SHA1 Message Date
Astro 53d931dccc szl: invoke ps7_init::apply() at start 2020-06-27 02:36:36 +02:00
Astro d8745074b4 update dependencies 2020-06-27 02:29:45 +02:00
3 changed files with 9 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
default.nix
View File

@ -15,7 +15,7 @@ let
version = "0.1.0"; version = "0.1.0";
src = ./src; src = ./src;
cargoSha256 = "0h3sr474a9l5w27l908xhi71hs6y44090r2c6b2qh45984kj0397"; cargoSha256 = "05x9l6vrppvhr4qphpjklq4jlhyid1y9xg6qa52s7p7564gcvg4w";
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.gnumake pkgs.gnumake

10
src/Cargo.lock generated
View File

@ -184,7 +184,7 @@ dependencies = [
[[package]] [[package]]
name = "libasync" name = "libasync"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#c0e66a632c56bb5536459cba2ef481b2c50684e7" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ec252b099cf67a51ba9daa72b3292db8c21ba1b8"
dependencies = [ dependencies = [
"embedded-hal", "embedded-hal",
"libcortex_a9", "libcortex_a9",
@ -196,7 +196,7 @@ dependencies = [
[[package]] [[package]]
name = "libboard_zynq" name = "libboard_zynq"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#c0e66a632c56bb5536459cba2ef481b2c50684e7" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ec252b099cf67a51ba9daa72b3292db8c21ba1b8"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"embedded-hal", "embedded-hal",
@ -212,7 +212,7 @@ dependencies = [
[[package]] [[package]]
name = "libcortex_a9" name = "libcortex_a9"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#c0e66a632c56bb5536459cba2ef481b2c50684e7" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ec252b099cf67a51ba9daa72b3292db8c21ba1b8"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"libregister", "libregister",
@ -221,7 +221,7 @@ dependencies = [
[[package]] [[package]]
name = "libregister" name = "libregister"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#c0e66a632c56bb5536459cba2ef481b2c50684e7" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ec252b099cf67a51ba9daa72b3292db8c21ba1b8"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"vcell", "vcell",
@ -231,7 +231,7 @@ dependencies = [
[[package]] [[package]]
name = "libsupport_zynq" name = "libsupport_zynq"
version = "0.0.0" version = "0.0.0"
source = "git+https://git.m-labs.hk/M-Labs/zc706.git#c0e66a632c56bb5536459cba2ef481b2c50684e7" source = "git+https://git.m-labs.hk/M-Labs/zc706.git#ec252b099cf67a51ba9daa72b3292db8c21ba1b8"
dependencies = [ dependencies = [
"compiler_builtins", "compiler_builtins",
"libboard_zynq", "libboard_zynq",

3
src/szl/src/main.rs
View File

@ -11,6 +11,7 @@ use libcortex_a9::cache::dcci_slice;
use libboard_zynq::{ use libboard_zynq::{
self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll}, self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll},
logger, logger,
ps7_init,
timer::GlobalTimer, timer::GlobalTimer,
}; };
use libsupport_zynq as _; use libsupport_zynq as _;
@ -28,6 +29,8 @@ extern fn lzma_error(message: *const u8) {
#[no_mangle] #[no_mangle]
pub fn main_core0() { pub fn main_core0() {
ps7_init::apply();
GlobalTimer::start(); GlobalTimer::start();
logger::init().unwrap(); logger::init().unwrap();
log::set_max_level(log::LevelFilter::Debug); log::set_max_level(log::LevelFilter::Debug);