Fixed more esp-idf 5.0 changes

ducalex · Aug 27, 2024 · 5de36e4 · 5de36e4
1 parent 348dc5e
commit 5de36e4
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 70 deletions.
diff --git a/components/retro-go/rg_storage.c b/components/retro-go/rg_storage.c
@@ -497,7 +497,7 @@ bool rg_storage_write_file(const char *path, const void *data_ptr, size_t data_l
  * to do some testing to determine if the increased executable size is acceptable...
  */
 #if RG_ZIP_SUPPORT
-#include <rom/miniz.h>
+#include <miniz.h>
 #endif
 
 #define ZIP_MAGIC 0x04034b50

diff --git a/components/retro-go/targets/esp32s3-devkit-c/sdkconfig b/components/retro-go/targets/esp32s3-devkit-c/sdkconfig
@@ -53,26 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
 CONFIG_SPIRAM=y
-
-CONFIG_ESP32S3_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -146,8 +144,6 @@ CONFIG_LOG_COLORS=y
 #
 # Misc
 #
-# ODROID-GO partition table doesn't use any checksum
-CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 
 #

diff --git a/components/retro-go/targets/esplay-micro/sdkconfig b/components/retro-go/targets/esplay-micro/sdkconfig
@@ -53,24 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -134,6 +134,7 @@ CONFIG_LOG_COLORS=y
 # Misc
 #
 # ODROID-GO partition table doesn't use any checksum
+CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS=y
 CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 

diff --git a/components/retro-go/targets/esplay-s3/sdkconfig b/components/retro-go/targets/esplay-s3/sdkconfig
@@ -53,24 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -134,6 +134,7 @@ CONFIG_LOG_COLORS=y
 # Misc
 #
 # ODROID-GO partition table doesn't use any checksum
+CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS=y
 CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 

diff --git a/components/retro-go/targets/fri3d-2024/sdkconfig b/components/retro-go/targets/fri3d-2024/sdkconfig
@@ -53,26 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
 CONFIG_SPIRAM=y
-
-CONFIG_ESP32S3_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -150,8 +148,6 @@ CONFIG_LOG_COLORS=y
 #
 # Misc
 #
-# ODROID-GO partition table doesn't use any checksum
-CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 
 #

diff --git a/components/retro-go/targets/mrgc-g32/sdkconfig b/components/retro-go/targets/mrgc-g32/sdkconfig
@@ -53,24 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -134,6 +134,7 @@ CONFIG_LOG_COLORS=y
 # Misc
 #
 # ODROID-GO partition table doesn't use any checksum
+CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS=y
 CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 

diff --git a/components/retro-go/targets/mrgc-gbm/sdkconfig b/components/retro-go/targets/mrgc-gbm/sdkconfig
@@ -53,24 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -134,6 +134,7 @@ CONFIG_LOG_COLORS=y
 # Misc
 #
 # ODROID-GO partition table doesn't use any checksum
+CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS=y
 CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 

diff --git a/components/retro-go/targets/odroid-go/sdkconfig b/components/retro-go/targets/odroid-go/sdkconfig
@@ -53,24 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -132,6 +132,7 @@ CONFIG_LOG_COLORS=y
 # Misc
 #
 # ODROID-GO partition table doesn't use any checksum
+CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS=y
 CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 

diff --git a/components/retro-go/targets/qtpy-gamer/sdkconfig b/components/retro-go/targets/qtpy-gamer/sdkconfig
@@ -53,24 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -134,6 +134,7 @@ CONFIG_LOG_COLORS=y
 # Misc
 #
 # ODROID-GO partition table doesn't use any checksum
+CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS=y
 CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n
 

diff --git a/components/retro-go/targets/retro-esp32/sdkconfig b/components/retro-go/targets/retro-esp32/sdkconfig
@@ -53,24 +53,24 @@ CONFIG_ESP32_REV_MIN_1=y
 CONFIG_ESP32_REV_MIN_2=n
 CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=n
-CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=n
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=n
 CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y
 CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=n
 CONFIG_ESP_SYSTEM_PANIC_GDBSTUB=n
-CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_DEBUG_OCDAWARE=n
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_INT_WDT=y
-CONFIG_ESP_TASK_WDT=n
+CONFIG_ESP_TASK_WDT_INIT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 
 #
 # SPI RAM config
 #
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=n
@@ -134,6 +134,7 @@ CONFIG_LOG_COLORS=y
 # Misc
 #
 # ODROID-GO partition table doesn't use any checksum
+CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS=y
 CONFIG_PARTITION_TABLE_MD5=n
 CONFIG_APP_BUILD_BOOTLOADER=n