Skip to content

Commit 64673b4

Browse files
committed
Merge branch 'bugfix/esp32s2_cache_unsupport_config' into 'master'
esp32s2: remove unsupported cache option Closes IDFGH-3414 See merge request espressif/esp-idf!9300
2 parents 583f6e5 + 6b12ac0 commit 64673b4

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

components/esp32s2/Kconfig

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,12 @@ menu "ESP32S2-specific"
8282

8383
choice ESP32S2_DATA_CACHE_SIZE
8484
prompt "Data cache size"
85-
default ESP32S2_DATA_CACHE_8KB
85+
default ESP32S2_DATA_CACHE_0KB if !ESP32S2_SPIRAM_SUPPORT
86+
default ESP32S2_DATA_CACHE_8KB if ESP32S2_SPIRAM_SUPPORT
8687
help
8788
Data cache size to be set on application startup.
88-
If you use 8KB data cache rather than 16KB data cache, the other 8KB will be added to the heap.
89+
If you use 0KB data cache, the other 16KB will be added to the heap
90+
If you use 8KB data cache rather than 16KB data cache, the other 8KB will be added to the heap
8991

9092
config ESP32S2_DATA_CACHE_0KB
9193
depends on !ESP32S2_SPIRAM_SUPPORT
@@ -212,30 +214,11 @@ menu "ESP32S2-specific"
212214
If SPIRAM_FETCH_INSTRUCTIONS also enabled,
213215
you can run the instruction when erasing or programming the flash.
214216

215-
config SPIRAM_USE_AHB_DBUS3
216-
bool "Enable AHB DBUS3 to access SPIRAM"
217-
default n
218-
help
219-
If Enabled, if SPI_CONFIG_SIZE is bigger then 10MB+576KB,
220-
then you can have 4MB more space to map the SPIRAM.
221-
However, the AHB bus is slower than other data cache buses.
222-
223217
choice SPIRAM_SPEED
224218
prompt "Set RAM clock speed"
225219
default SPIRAM_SPEED_40M
226220
help
227221
Select the speed for the SPI RAM chip.
228-
If SPI RAM is enabled, we only support three combinations of SPI speed mode we supported now:
229-
230-
1. Flash SPI running at 40Mhz and RAM SPI running at 40Mhz
231-
2. Flash SPI running at 80Mhz and RAM SPI running at 40Mhz
232-
3. Flash SPI running at 80Mhz and RAM SPI running at 80Mhz
233-
234-
Note: If the third mode(80Mhz+80Mhz) is enabled for SPI RAM of type 32MBit, one of the HSPI/VSPI host
235-
will be occupied by the system. Which SPI host to use can be selected by the config item
236-
SPIRAM_OCCUPY_SPI_HOST. Application code should never touch HSPI/VSPI hardware in this case. The
237-
option to select 80MHz will only be visible if the flash SPI speed is also 80MHz.
238-
(ESPTOOLPY_FLASHFREQ_80M is true)
239222

240223
config SPIRAM_SPEED_80M
241224
bool "80MHz clock speed"

0 commit comments

Comments
 (0)