Skip to content

Commit

Permalink
Rebuild miniblink example for STM32VL Discovery QEMU machine
Browse files Browse the repository at this point in the history
The STM32F0 Discovery QEMU machine, which is used for the miniblink
example is not part of upstream. Replace it with the STM32VL Discovery
machine, which is available in upstream QEMU.
  • Loading branch information
lukasauer committed Jan 10, 2023
1 parent de8943b commit 5ef74f0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 285 deletions.
31 changes: 16 additions & 15 deletions fault.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"max_instruction_count": 100 ,
"max_instruction_count": 100,
"start" : {
"address" : 134218138,
"address" : 0x0800024a,
"counter" : 1
},
"end" : {
"address" : 134217964,
"address" : 0x0800017c,
"counter" : 3
},
"faults" :[
"faults" :[
[
{
"fault_address" : [134217728],
{
"fault_address" : [0x08000000],
"fault_type" : "data",
"fault_model" : "toggle",
"fault_lifespan" : [1000],
"fault_mask" : [3],
"trigger_address" : [134217950],
"trigger_address" : [0x08000170],
"trigger_counter" : [1]
}
],
[
{
"fault_address" : [134217954],
{
"fault_address" : [0x08000174],
"fault_type" : "instruction",
"fault_model" : "set1",
"fault_lifespan" : [10],
Expand All @@ -38,17 +38,17 @@
"fault_model" : "set1",
"fault_lifespan" : [0],
"fault_mask" : {"type" : "shift", "range" : [1, 0, 6]},
"trigger_address" : [134217954],
"trigger_address" : [0x08000174],
"trigger_counter" : [1]
}
],
[
{
"fault_address" : [134217962],
"fault_address" : [0x0800017a],
"fault_type" : "instruction",
"fault_model" : "overwrite",
"fault_lifespan" : [0, 3, 2],
"fault_mask" : [191],
"fault_mask" : [191],
"trigger_address" : [-1],
"trigger_counter" : [3],
"num_bytes" : [2]
Expand All @@ -57,8 +57,9 @@
],
"memorydump": [
{
"address" : 134217728 ,
"length" : 1023
"address" : 0x08000000,
"length" : 1023
}
]
],
"mem_info": true
}
2 changes: 1 addition & 1 deletion miniblink/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Miniblink

This binary was build from the [libopencm3 example project](https://github.com/libopencm3/libopencm3-examples).
The used miniblink can be found inside the git under [examples/stm32/f0/stm32f0-discovery/miniblink](https://github.com/libopencm3/libopencm3-examples/tree/master/examples/stm32/f0/stm32f0-discovery/miniblink)
The used miniblink can be found inside the git under [examples/stm32/f1/stm32vl-discovery/miniblink](https://github.com/libopencm3/libopencm3-examples/tree/master/examples/stm32/f1/stm32vl-discovery/miniblink)
Binary file modified miniblink/miniblink.bin
Binary file not shown.
Binary file modified miniblink/miniblink.elf
Binary file not shown.
268 changes: 0 additions & 268 deletions miniblink/miniblink.list

This file was deleted.

2 changes: 1 addition & 1 deletion qemuconf.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"bios" : "",
"kernel" : "miniblink/miniblink.bin",
"plugin" : "faultplugin/libfaultplugin.so",
"machine" : "stm32f0discovery",
"machine" : "stm32vldiscovery",
"additional_qemu_args" : ""
}

0 comments on commit 5ef74f0

Please sign in to comment.