-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cpu/esp_common: use spli_flash_* funcs from ESP-IDF in periph/flash #18250
Merged
benpicco
merged 5 commits into
RIOT-OS:master
from
gschorcht:cpu/esp32/remove_spli_flash_funcs
Jun 25, 2022
Merged
cpu/esp_common: use spli_flash_* funcs from ESP-IDF in periph/flash #18250
benpicco
merged 5 commits into
RIOT-OS:master
from
gschorcht:cpu/esp32/remove_spli_flash_funcs
Jun 25, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gschorcht
requested review from
leandrolanzieri,
jia200x and
MrKevinWeiss
as code owners
June 23, 2022 12:00
github-actions
bot
added
Area: build system
Area: Build system
Area: cpu
Area: CPU/MCU ports
Area: Kconfig
Area: Kconfig integration
Platform: ESP
Platform: This PR/issue effects ESP-based platforms
labels
Jun 23, 2022
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
changed the title
cpu/esp32: use
cpu/esp_common: use spli_flash_* funcs from ESP-IDF in periph/flash
Jun 23, 2022
spli_flash*
funcs from ESP-IDF in periph/flash
gschorcht
force-pushed
the
cpu/esp32/remove_spli_flash_funcs
branch
from
June 25, 2022 05:45
6a9dd34
to
4394b3b
Compare
github-actions
bot
removed
Area: build system
Area: Build system
Area: Kconfig
Area: Kconfig integration
labels
Jun 25, 2022
The MCU_* conditionals are inverted so that they can be tested for ESP8266. In all other cases the MCU is any ESP32x SoC
Updates `cpu/esp_common/periph/flash` for ESP-IDF 4.4. `spi_flash_*` functions for ESP32 are removed since these functions are now used from ESP-IDF.
esp32 vendor code and atwinc15x0 both define conflicting spi_flash_{read, write} functions. esp32 already have build-in WiFi, so it's unlikely to ever use this driver - just blacklist the architecture.
gschorcht
force-pushed
the
cpu/esp32/remove_spli_flash_funcs
branch
from
June 25, 2022 06:13
4394b3b
to
94e7dbf
Compare
Rebased and now ready for review. I rearranged the changes a bit and split them into different commits to separate the core changes from the cleanup changes. The core changes are commits 94ceccb and fb2f080. All others are only cleanups (portable formatting in DEBUG messages and removing whitespaces). |
gschorcht
added
CI: ready for build
If set, CI server will compile all applications for all available boards for the labeled PR
and removed
CI: ready for build
If set, CI server will compile all applications for all available boards for the labeled PR
labels
Jun 25, 2022
benpicco
approved these changes
Jun 25, 2022
@benpicco Thanks for reviewing and merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Area: cpu
Area: CPU/MCU ports
Area: drivers
Area: Device drivers
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contribution description
This PR is a split-off from PR #17841. With this PR, the
spi_flash_*
functions of ESP-IDF are used and can therefore be removed fromcpu/esp_common/periph/flash.c
. Additionally, theDEBUG
outputs are changed to be platform independent.This PR depends on PR #18249. To be compilable, it includes PR #18249 at the moment. The only commit of this PR is e8b4f55.
Testing procedure
Green CI
Issues/PRs references
Depends on PR #18249
Split-off from PR #17841