Skip to content

Commit

Permalink
Merge pull request #561 from lschuermann/dev/qemu-rv32-virt-board
Browse files Browse the repository at this point in the history
Add qemu_rv32_virt board definition
  • Loading branch information
alevy authored Oct 11, 2024
2 parents 8bacc47 + 8102f98 commit 7c18230
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
16 changes: 9 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,21 @@ usage:
@echo
@echo "The next step is to choose a board to build Tock for. Mainline"
@echo "libtock-rs currently includes support for the following platforms:"
@echo " - apollo3"
@echo " - clue_nrf52840"
@echo " - esp32_c3_devkitm_1"
@echo " - hail"
@echo " - nrf52840"
@echo " - hifive1"
@echo " - imxrt1050"
@echo " - microbit_v2"
@echo " - nrf52"
@echo " - nrf52840"
@echo " - nucleo_f429zi"
@echo " - nucleo_f446re"
@echo " - opentitan"
@echo " - hifive1"
@echo " - nrf52"
@echo " - imxrt1050"
@echo " - apollo3"
@echo " - qemu_rv32_virt"
@echo " - stm32f3discovery"
@echo " - stm32f412gdiscovery"
@echo " - esp32_c3_devkitm_1"
@echo " - clue_nrf52840"
@echo
@echo "Run 'make setup' to setup Rust to build libtock-rs."
@echo "Run 'make <board> EXAMPLE=<>' to build EXAMPLE for that board."
Expand Down Expand Up @@ -275,6 +276,7 @@ $(eval $(call platform_flash,nrf52840,thumbv7em-none-eabi))
$(eval $(call platform_build,raspberry_pi_pico,thumbv6m-none-eabi))
$(eval $(call platform_build,nano33ble,thumbv6m-none-eabi))
$(eval $(call platform_build,nano_rp2040_connect,thumbv6m-none-eabi))
$(eval $(call platform_build,qemu_rv32_virt,riscv32imac-unknown-none-elf))
$(eval $(call platform_build,stm32f3discovery,thumbv7em-none-eabi))
$(eval $(call platform_build,stm32f412gdiscovery,thumbv7em-none-eabi))
$(eval $(call platform_build,opentitan,riscv32imc-unknown-none-elf))
Expand Down
1 change: 1 addition & 0 deletions build_scripts/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const PLATFORMS: &[(&str, &str, &str, &str, &str)] = &[
("nucleo_f429zi" , "0x08040000", "255K" , "0x20004000", "112K" ),
("nucleo_f446re" , "0x08040000", "255K" , "0x20004000", "176K" ),
("opentitan" , "0x20030000", "32M" , "0x10006000", "126K" ),
("qemu_rv32_virt" , "0x80100000", "0x0100000", "0x8020a000", "0xf6000"),
("raspberry_pi_pico" , "0x10040000", "256K" , "0x20012000", "192K" ),
("stm32f3discovery" , "0x08020000", "0x0020000", "0x20004000", "48K" ),
("stm32f412gdiscovery", "0x08030000", "256K" , "0x20004000", "112K" ),
Expand Down
2 changes: 1 addition & 1 deletion runner/src/elf2tab.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn get_platform_architecture(platform: &str) -> Option<&'static str> {
| "stm32f412gdiscovery" => Some("cortex-m4"),
"imxrt1050" | "teensy40" => Some("cortex-m7"),
"opentitan" | "esp32_c3_devkitm_1" => Some("riscv32imc"),
"hifive1" => Some("riscv32imac"),
"hifive1" | "qemu_rv32_virt" => Some("riscv32imac"),
_ => None,
}
}
Expand Down

0 comments on commit 7c18230

Please sign in to comment.