1
0
Fork 0

Merge branch 'cora'

This commit is contained in:
Astro 2020-01-22 01:19:01 +01:00
commit d88ba97a03
3 changed files with 7 additions and 7 deletions

View File

@ -1,12 +1,13 @@
[package] [package]
name = "zc706-experiments" name = "zc706-experiments"
description = "Developing bare-metal Rust on Zynq"
version = "0.0.0" version = "0.0.0"
authors = ["Astro <astro@spaceboyz.net>"] authors = ["Astro <astro@spaceboyz.net>"]
edition = "2018" edition = "2018"
[features] [features]
target_zc706 = [] target_zc706 = ["libboard_zynq/target_zc706", "libboard_zc706/target_zc706"]
target_cora_z7_10 = [] target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libboard_zc706/target_cora_z7_10"]
default = ["target_zc706"] default = ["target_zc706"]
[dependencies] [dependencies]

View File

@ -1,14 +1,13 @@
[package] [package]
name = "libboard_zc706" name = "libboard_zc706"
description = "Software support for running on devboards"
version = "0.0.0" version = "0.0.0"
authors = ["Astro <astro@spaceboyz.net>"] authors = ["Astro <astro@spaceboyz.net>"]
edition = "2018" edition = "2018"
[features] [features]
# TODO: propagate to libboard_zynq target_zc706 = ["libboard_zynq/target_zc706"]
target_zc706 = [] target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10"]
target_cora_z7_10 = []
default = ["target_zc706"]
[dependencies] [dependencies]
r0 = "0.2" r0 = "0.2"

View File

@ -1,5 +1,6 @@
[package] [package]
name = "libboard_zynq" name = "libboard_zynq"
description = "Drivers for peripherals in the Zynq PS"
version = "0.0.0" version = "0.0.0"
authors = ["Astro <astro@spaceboyz.net>"] authors = ["Astro <astro@spaceboyz.net>"]
edition = "2018" edition = "2018"
@ -7,7 +8,6 @@ edition = "2018"
[features] [features]
target_zc706 = [] target_zc706 = []
target_cora_z7_10 = [] target_cora_z7_10 = []
default = ["target_zc706"]
[dependencies] [dependencies]
r0 = "0.2" r0 = "0.2"