From fc8e948a860668208cc2e54e472c6bcc57103264 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 22 Jan 2020 00:44:36 +0100 Subject: [PATCH 1/2] */Cargo.toml: pass down target_* feature flags to dependencies --- experiments/Cargo.toml | 4 ++-- libboard_zc706/Cargo.toml | 6 ++---- libboard_zynq/Cargo.toml | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml index 3f10b01..62e0b97 100644 --- a/experiments/Cargo.toml +++ b/experiments/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Astro "] edition = "2018" [features] -target_zc706 = [] -target_cora_z7_10 = [] +target_zc706 = ["libboard_zynq/target_zc706", "libboard_zc706/target_zc706"] +target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libboard_zc706/target_cora_z7_10"] default = ["target_zc706"] [dependencies] diff --git a/libboard_zc706/Cargo.toml b/libboard_zc706/Cargo.toml index 50feced..4515f1e 100644 --- a/libboard_zc706/Cargo.toml +++ b/libboard_zc706/Cargo.toml @@ -5,10 +5,8 @@ authors = ["Astro "] edition = "2018" [features] -# TODO: propagate to libboard_zynq -target_zc706 = [] -target_cora_z7_10 = [] -default = ["target_zc706"] +target_zc706 = ["libboard_zynq/target_zc706"] +target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10"] [dependencies] r0 = "0.2" diff --git a/libboard_zynq/Cargo.toml b/libboard_zynq/Cargo.toml index 1b0d93a..d3fbf4e 100644 --- a/libboard_zynq/Cargo.toml +++ b/libboard_zynq/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [features] target_zc706 = [] target_cora_z7_10 = [] -default = ["target_zc706"] [dependencies] r0 = "0.2" From 6272e381f1685333fc502cb4091217918a791746 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 22 Jan 2020 00:47:22 +0100 Subject: [PATCH 2/2] */Cargo.toml: add descriptions --- experiments/Cargo.toml | 1 + libboard_zc706/Cargo.toml | 1 + libboard_zynq/Cargo.toml | 1 + 3 files changed, 3 insertions(+) diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml index 62e0b97..ff15518 100644 --- a/experiments/Cargo.toml +++ b/experiments/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "zc706-experiments" +description = "Developing bare-metal Rust on Zynq" version = "0.0.0" authors = ["Astro "] edition = "2018" diff --git a/libboard_zc706/Cargo.toml b/libboard_zc706/Cargo.toml index 4515f1e..2047373 100644 --- a/libboard_zc706/Cargo.toml +++ b/libboard_zc706/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libboard_zc706" +description = "Software support for running on devboards" version = "0.0.0" authors = ["Astro "] edition = "2018" diff --git a/libboard_zynq/Cargo.toml b/libboard_zynq/Cargo.toml index d3fbf4e..a23094e 100644 --- a/libboard_zynq/Cargo.toml +++ b/libboard_zynq/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "libboard_zynq" +description = "Drivers for peripherals in the Zynq PS" version = "0.0.0" authors = ["Astro "] edition = "2018"