Skip to content

cpu/esp32: invert MCU_* and CPU* conditionals#18248

Merged
benpicco merged 2 commits intoRIOT-OS:masterfrom
gschorcht:cpu/esp32/inverse_MCU_CPU_conditionals
Jun 23, 2022
Merged

cpu/esp32: invert MCU_* and CPU* conditionals#18248
benpicco merged 2 commits intoRIOT-OS:masterfrom
gschorcht:cpu/esp32/inverse_MCU_CPU_conditionals

Conversation

@gschorcht
Copy link
Copy Markdown
Contributor

@gschorcht gschorcht commented Jun 23, 2022

Contribution description

This PR is a split-off from PR #17841. It provides the following changes to allow the compilation for different ESP32x SoC variants:

  • MCU_* conditionals in source code are inverted so that they can be tested for MCU_ESP8266. In all other cases the MCU is any ESP32x SoC variant.
  • CPU conditionals in esptool.mk are inverted so that they can be tested for esp8266. In all other cases the MCU is any ESP32x SoC variant.

Testing procedure

Green CI.

Issues/PRs references

Split-off from PR #17841.

The MCU_* conditionals are inverted so that they can be tested for ESP8266. In all other cases the MCU is any ESP32x SoC
The CPU* conditionals are inverted so that they can be tested for ESP8266. In all other cases the MCU is any ESP32x SoC
@github-actions github-actions bot added Area: build system Area: Build system Area: cpu Area: CPU/MCU ports Area: tools Area: Supplementary tools Platform: ESP Platform: This PR/issue effects ESP-based platforms labels Jun 23, 2022
@gschorcht gschorcht added Type: enhancement The issue suggests enhanceable parts / The PR enhances 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 Jun 23, 2022
@gschorcht gschorcht requested a review from benpicco June 23, 2022 11:31
@benpicco benpicco merged commit 61d17d5 into RIOT-OS:master Jun 23, 2022
@gschorcht
Copy link
Copy Markdown
Contributor Author

@benpicco Thanks for reviewing and merging.

@gschorcht gschorcht deleted the cpu/esp32/inverse_MCU_CPU_conditionals branch June 25, 2022 22:54
@chrysn chrysn added this to the Release 2022.07 milestone Aug 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: build system Area: Build system Area: cpu Area: CPU/MCU ports Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ESP Platform: This PR/issue effects ESP-based platforms Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants