Skip to content

Commit bde4053

Browse files
authored
Merge branch 'master' into remove_unused_module
2 parents dbdfb67 + 4a6300f commit bde4053

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rustflags = [
1111
# "-Z",
1212
# "trap-unreachable=no",
1313
"-C",
14-
"inline-threshold=5",
14+
"llvm-args=--inline-threshold=5",
1515
"-C",
1616
"no-vectorize-loops",
1717
"-C",

calculate-memory.rhai

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ variable::set(
2020
).to_hex()
2121
);
2222

23-
let target = variable::get("target");
23+
let target = variable::get("target-arch");
2424

2525
variable::set("architecture", switch target {
2626
"thumbv6m-none-eabi" => "armv6m",

template.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ variants:
1212
range:
1313
start: {{ram-start-address}}
1414
end: {{ram-end-address}}
15-
is_boot_memory: false
15+
access:
16+
boot: false
1617
cores:
1718
- main
1819
- !Nvm
1920
range:
2021
start: {{flash-start-address}}
2122
end: {{flash-end-address}}
22-
is_boot_memory: true
23+
access:
24+
boot: true
2325
cores:
2426
- main
2527
flash_algorithms:

0 commit comments

Comments
 (0)