Skip to content

boards/esp32: deduplication in common ESP32x board definitions#19432

Merged
bors[bot] merged 5 commits intoRIOT-OS:masterfrom
gschorcht:boards/esp32/deduplicate_common
Apr 12, 2023
Merged

boards/esp32: deduplication in common ESP32x board definitions#19432
bors[bot] merged 5 commits intoRIOT-OS:masterfrom
gschorcht:boards/esp32/deduplicate_common

Conversation

@gschorcht
Copy link
Copy Markdown
Contributor

Contribution description

The PR reduced code duplication in boards/common/esp32*.

The PR moves the header files from boards/common/esp32s3/include that can be used for all types of ESP32x SoCs to a new common ESP32x board definition which is then included by all common ESP32x board definitions.

Testing procedure

Green CI.

Issues/PRs references

The commit moves the header files from `boards/common/esp32s3/include` that can be used for all types of ESP32x SoCs to a new common ESP32x board module.
@github-actions github-actions bot added Area: boards Area: Board ports Area: doc Area: Documentation Area: Kconfig Area: Kconfig integration labels Mar 29, 2023
@gschorcht gschorcht added Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Mar 29, 2023
@riot-ci
Copy link
Copy Markdown

riot-ci commented Mar 29, 2023

Murdock results

✔️ PASSED

128a633 boards/common/esp32: use boards_common_esp32x

Success Failures Total Runtime
6882 0 6882 09m:21s

Artifacts

@gschorcht gschorcht force-pushed the boards/esp32/deduplicate_common branch from 7ca12f4 to 984840b Compare March 30, 2023 05:06
@gschorcht gschorcht changed the title boards/esp32: deduplication for common ESP32x board definitions boards/esp32: deduplication in common ESP32x board definitions Mar 30, 2023
@gschorcht gschorcht force-pushed the boards/esp32/deduplicate_common branch from 984840b to 128a633 Compare March 30, 2023 05:27
@benpicco
Copy link
Copy Markdown
Contributor

bors merge

bors bot added a commit that referenced this pull request Apr 12, 2023
19411: cpu/gd32v: add riotboot support r=benpicco a=gschorcht

### Contribution description

This PR provides `riotboot` support for GD32V.

### Testing procedure

Use any GD32V board with a JTAG adapter and flash the bootloader:
```python
PROGRAMMER=openocd BOARD=sipeed-longan-nano make -C bootloaders/riotboot flash
```
Flash slot 0 and set `RIOT_VERSION` to 1
```python
USEMODULE=stdio_uart FEATURES_REQUIRED=riotboot RIOT_VERSION=1 \
PROGRAMMER=openocd BOARD=sipeed-longan-nano make -C tests/shell riotboot/flash-slot0
...
### Flashing Target ###
Binfile detected, adding ROM base address: 0x08000000
Flashing with IMAGE_OFFSET: 0x08001000
```
```python
> main(): This is RIOT! (Version: 1)
test_shell.
```
Flash slot 1 and set `RIOT_VERSION` to 2
```python
USEMODULE=stdio_uart FEATURES_REQUIRED=riotboot RIOT_VERSION=2 \
PROGRAMMER=openocd BOARD=sipeed-longan-nano make -C tests/shell riotboot/flash-slot1
...
### Flashing Target ###
Binfile detected, adding ROM base address: 0x08000000
Flashing with IMAGE_OFFSET: 0x08010800
```
```python
> main(): This is RIOT! (Version: 2)
test_shell.
```

### Issues/PRs references


19432: boards/esp32: deduplication in common ESP32x board definitions r=benpicco a=gschorcht

### Contribution description

The PR reduced code duplication in `boards/common/esp32*`.

The PR moves the header files from `boards/common/esp32s3/include` that can be used for all types of ESP32x SoCs to a new common ESP32x board definition which is then included by all common ESP32x board definitions.

### Testing procedure

Green CI.

### Issues/PRs references


19461: drivers/enc28j60: fix ISR routine and bth r=benpicco a=peteut



Co-authored-by: Gunar Schorcht <[email protected]>
Co-authored-by: Alain Péteut <[email protected]>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Apr 12, 2023

Build failed (retrying...):

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Apr 12, 2023

Build succeeded:

@bors bors bot merged commit 99b13cb into RIOT-OS:master Apr 12, 2023
@gschorcht
Copy link
Copy Markdown
Contributor Author

Thanks

@gschorcht gschorcht deleted the boards/esp32/deduplicate_common branch April 26, 2023 09:42
bors bot added a commit that referenced this pull request May 20, 2023
19433: cpu/esp32: deduplication in Kconfig for ESP32x SoCs r=aabadie a=gschorcht

### Contribution description

This PR reduces the code duplication in Kconfig for ESP32x SoCs.

It defines a new common CPU symbol `CPU_COMMON_ESP32X` in Kconfig that is used by all `CPU_FAM_ESP32x` symbols. It selects all features, modules and packages that are common for all ESP32x SoC variants. This avoids the selection of features, modules and packages again and again for each ESP32x SoC variant.

The same is done in PR #19432 for common ESP32x board definitions.

### Testing procedure

Green CI

### Issues/PRs references

Co-authored-by: Gunar Schorcht <[email protected]>
@benpicco benpicco added this to the Release 2023.07 milestone Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: boards Area: Board ports Area: doc Area: Documentation Area: Kconfig Area: Kconfig integration CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants