Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[build]
{% if target == "riscv32ec-unknown-none-elf" -%}
target = "riscv32ec-unknown-none-elf.json"
{%- elsif target == "riscv32emc-unknown-none-elf" -%}
target = "riscv32emc-unknown-none-elf.json"
{%- elsif target == "riscv32imfc-unknown-none-elf" -%}
target = "riscv32imfc-unknown-none-elf.json"
{%- else -%}
Expand All @@ -10,7 +12,7 @@ target = "{{ target }}"
[target."{{ target }}"]
runner = "wlink -v flash --enable-sdi-print --watch-serial"

{% if target == "riscv32ec-unknown-none-elf" or target == "riscv32imfc-unknown-none-elf" -%}
{% if target == "riscv32ec-unknown-none-elf" or target == "riscv32emc-unknown-none-elf" or target == "riscv32imfc-unknown-none-elf" -%}
[unstable]
build-std = ["core"]
json-target-spec = true
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
[
ch32l103,
ch32v003,
ch32v00x,
ch32v103,
ch32v203,
ch32v208,
Expand Down
38 changes: 38 additions & 0 deletions cargo-generate.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ prompt = "Which MCU family to target?"
choices = [
"ch32l103",
"ch32v003",
"ch32v00x",
"ch32v103",
"ch32v203",
"ch32v208",
Expand All @@ -33,6 +34,9 @@ default = "ch32v003"
[conditional.'mcu_family != "ch32v003" && mcu_family != "ch641"']
ignore = ["riscv32ec-unknown-none-elf.json"]

[conditional.'mcu_family != "ch32v00x"']
ignore = ["riscv32emc-unknown-none-elf.json"]

[conditional.'mcu_family != "ch32v303" && mcu_family != "ch32v305" && mcu_family != "ch32v307"']
ignore = ["riscv32imfc-unknown-none-elf.json"]

Expand All @@ -53,6 +57,40 @@ mcu = { type = "string", prompt = "Which ch32v003 variant to use?", choices = [
"ch32v003j4m6",
], default = "ch32v003f4p6" }

[conditional.'mcu_family == "ch32v00x"'.placeholders]
mcu = { type = "string", prompt = "Which ch32v00x variant to use?", choices = [
"ch32v002f4p6",
"ch32v002f4u6",
"ch32v002a4m6",
"ch32v002d4u6",
"ch32v002j4m6",

"ch32v004f6p1",
"ch32v004f6u1",

"ch32v005e6r6",
"ch32v005f6u6",
"ch32v005f6p6",
"ch32v005d6u6",

"ch32v006k8u6",
"ch32v006e8r6",
"ch32v006f8u6",
"ch32v006f8p6",
"ch32v006f4u6",

"ch32m007g8r6",
"ch32m007e8r6",
"ch32m007e8u6",
"ch32v007e8r6",
"ch32v007k8u6",

"ch32v006e8r6",
"ch32v006f8u6",
"ch32v006f8p6",
"ch32v006k8u6",
], default = "ch32v006k8u6" }

[conditional.'mcu_family == "ch32v103"'.placeholders]
mcu = { type = "string", prompt = "Which ch32v103 variant to use?", choices = [
"ch32v103c6t6",
Expand Down
1 change: 1 addition & 0 deletions pre-script.rhai
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
let targets = #{
ch32l103: "riscv32imc-unknown-none-elf",
ch32v003: "riscv32ec-unknown-none-elf",
ch32v00x: "riscv32emc-unknown-none-elf",
ch32v103: "riscv32imc-unknown-none-elf",
ch32v203: "riscv32imc-unknown-none-elf",
ch32v208: "riscv32imc-unknown-none-elf",
Expand Down
18 changes: 18 additions & 0 deletions riscv32emc-unknown-none-elf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"arch": "riscv32",
"atomic-cas": false,
"cpu": "generic-rv32",
"crt-objects-fallback": "false",
"data-layout": "e-m:e-p:32:32-i64:64-n32-S32",
"eh-frame-header": false,
"emit-debug-gdb-scripts": false,
"features": "+e,+zmmul,+c,+forced-atomics",
"linker": "rust-lld",
"linker-flavor": "gnu-lld",
"llvm-target": "riscv32",
"llvm-abiname": "ilp32e",
"max-atomic-width": 32,
"panic-strategy": "abort",
"relocation-model": "static",
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
channel = "nightly"
components = ["rust-src"]
{% if target != "riscv32ec-unknown-none-elf" and target != "riscv32imfc-unknown-none-elf" -%}
{% if target != "riscv32ec-unknown-none-elf" and target != "riscv32emc-unknown-none-elf" and target != "riscv32imfc-unknown-none-elf" -%}
targets = ["{{ target }}"]
{%- endif %}