RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge #19115 #19116

Browse Source 
19115: boards/hip-badge: fix doc rendering r=benpicco a=benpicco



19116: makefiles/cargo-targets.inc.mk: Fix RISC-V target r=kaspar030 a=maribu

### Contribution description

Update the list of target triples to match
`makefiles/arch/riscv.inc.mk`. This fixes compilation with toolchains other than the obsolete toolchain that uses the incorrect `riscv-none-embed` triple.

### Testing procedure

```
make BOARD=hifive1b -C examples/rust-gcoap
```

Fails on `master` with a recent RISC-V toolchain, but hopefully compiles with this PR.

### Issues/PRs references

None

Co-authored-by: Benjamin Valentin <benjamin.valentin@bht-berlin.de>
Co-authored-by: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
This commit is contained in:
bors[bot] 2023-01-09 23:49:42 +00:00 committed by GitHub
commit de0bd9770f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
boards/hip-badge/doc.txt
View File

@ -1,17 +1,8 @@
/*
* Copyright (C) 2023 Benjamin Valentin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @defgroup boards_hip_badge HiP Badge
* @ingroup boards_esp32c3
* @brief Support for the Hacking in Parallel Badge
* @author Benjamin Valentin <benjamin.valentin@ml-pa.com>
*/
@defgroup boards_hip_badge HiP Badge
@ingroup boards_esp32c3
@brief Support for the Hacking in Parallel Badge
@author Benjamin Valentin <benjamin.valentin@ml-pa.com>
The HiP Badge is a board that was given to participants of the 2022 *Hacking in Parallel* event.
@ -60,3 +51,5 @@ The event (and badge) were organized on short notice (6 Weeks), so there are som
- [Badge Clinic](https://wiki.hip-berlin.de/index.php?title=Badge_Clinic)
- [Design files](https://gitlab.com/tidklaas/hip-badge/)
*/

10
makefiles/cargo-targets.inc.mk
View File

@ -28,8 +28,16 @@ $(CARGO_COMPILE_COMMANDS): $(BUILDDEPS)
$(Q)DIRS="$(DIRS)" APPLICATION_BLOBS="$(BLOBS)" \
"$(MAKE)" -C $(APPDIR) -f $(RIOTMAKE)/application.inc.mk compile-commands
@# replacement addresses https://github.com/rust-lang/rust-bindgen/issues/1555
@# Keep triples in sync with makefiles/arch/riscv.inc.mk
$(Q)$(RIOTTOOLS)/compile_commands/compile_commands.py $(CARGO_COMPILE_COMMANDS_FLAGS) $(BINDIR) \
| sed 's/"riscv-none-embed"/"riscv32"/g' \
| sed -e 's/"riscv32-none-elf"/"riscv32"/g' \
-e 's/"riscv-none-elf"/"riscv32"/g' \
-e 's/"riscv32-unknown-elf"/"riscv32"/g' \
-e 's/"riscv32-elf"/"riscv32"/g' \
-e 's/"riscv64-none-elf"/"riscv32"/g' \
-e 's/"riscv64-unknown-elf"/"riscv32"/g' \
-e 's/"riscv64-elf"/"riscv32"/g' \
-e 's/"riscv-none-embed"/"riscv32"/g' \
| $(LAZYSPONGE) $@