pkg/esp32_sdk: additional patches required for ESP32-S3 #18408
Conversation
gschorcht
added
Type: new feature
| #define DPORT_CACHE_GET_VAL(cpuid) (cpuid == 0) ? DPORT_CACHE_VAL(PRO) : DPORT_CACHE_VAL(APP) | ||
| #define DPORT_CACHE_GET_MASK(cpuid) (cpuid == 0) ? DPORT_CACHE_MASK(PRO) : DPORT_CACHE_MASK(APP) | ||
|
|
||
| -#ifndef RIOT_VERSION |
There was a problem hiding this comment.
Why not fix pkg/esp32_sdk/patches/0010-spi_flash-disable-functions-not-required-or-not-supp.patch instead?
There was a problem hiding this comment.
Good catch 👍 Hm, to be honest, I didn't have this option in mind. Does it matter? I can change it, but that requires at least one additional Murdock compilation, which is a bit of a gamble right now 😉
There was a problem hiding this comment.
Ok, I have changed patch pkg/esp32_sdk/patches/0010-spi_flash-disable-functions-not-required-or-not-supp.patch accordingly. Furthermore, I renamed the bootloader patch pkg/esp32_sdk/patches/0024-bootloader-remove-compile-from-banner.patch to fix the serial number.
I squashed directly to avoid an additional CI compilation.
There was a problem hiding this comment.
Changing the title of 0010-spi_flash-disable-functions-not-required-or-not-supp.patch to something 0010-spi_flash-disable-and-replace-functions.patch didn't work. The result was that the additional functions were lost and the compilation failed. I'm not really happy with it, because the patch now does more than just disable some functions. If it makes more sense to have a separate patch for the additional functions, I can change it back.
There was a problem hiding this comment.
@benpicco Are the patches OK now or should I revert the last changes?
The patches include the following changes: - define ARRAY_SIZE in `component/spi_flash/spi_flash_timing_tuning.c` only if it is not yet defined by RIOT macros - add alternative implementations for`spi_flash_disable_interrupts_caches_and_other_cpu` and `spi_flash_enable_interrupts_caches_and_other_cpu` if compiled for RIOT - fix the undefined reference to `rtc_gpio_force_hold_en_all` in `components/driver/gpio.c` - rename the bootloader patch to fix the serial number
gschorcht
force-pushed
the
pkg/esp32_sdk/patches_for_esp32s3
branch
from
c472d82
to
ca34e97
Compare
github-actions
bot
removed
Platform: ESP
gschorcht
added
the
Platform: ESP
|
@benpicco Thanks for reviewing and merging. |
Contribution description
This PR is a split-off from PR #18185 and provides additional patches of ESP-IDF required for the ESP32-S3 support.
In detail the patches include following changes:
component/spi_flash/spi_flash_timing_tuning.conly if it is not yet defined by RIOT macrosspi_flash_disable_interrupts_caches_and_other_cpuandspi_flash_enable_interrupts_caches_and_other_cpuifcomponent/spi_flash/cache_utils.cis compiled for RIOTrtc_gpio_force_hold_en_allincomponents/driver/gpio.cTesting procedure
Green CI
Issues/PRs references
Split-off from PR #18185