Updated sdkconfig and partition sizes for esp-idf 5.0

Silenced some deprecations. I'm aware of them but there's no easy way to fix them as long as we support 4.x. We're a bit over 4MB now. Oh well.
atomic14 · Aug 27, 2024 · 0cf255b · 0cf255b
1 parent c8b43dd
commit 0cf255b
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 3 deletions.
diff --git a/components/retro-go/targets/esp32s3-devkit-c/sdkconfig b/components/retro-go/targets/esp32s3-devkit-c/sdkconfig
@@ -167,3 +167,10 @@ CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
 # SPI Flash driver
 #
 CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
+
+
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/esplay-micro/sdkconfig b/components/retro-go/targets/esplay-micro/sdkconfig
@@ -149,6 +149,7 @@ CONFIG_HTTPD_MAX_URI_LEN=1024
 # Not ideal but I don't want to deal with CAs right now :(
 CONFIG_ESP_TLS_INSECURE=y
 CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
+CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=n
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
@@ -172,3 +173,8 @@ CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 #
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/esplay-s3/sdkconfig b/components/retro-go/targets/esplay-s3/sdkconfig
@@ -160,3 +160,9 @@ CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 #
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/fri3d-2024/sdkconfig b/components/retro-go/targets/fri3d-2024/sdkconfig
@@ -185,3 +185,8 @@ CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=n
 CONFIG_LWIP_IPV6=n
 
 
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/mrgc-g32/sdkconfig b/components/retro-go/targets/mrgc-g32/sdkconfig
@@ -149,6 +149,7 @@ CONFIG_HTTPD_MAX_URI_LEN=1024
 # Not ideal but I don't want to deal with CAs right now :(
 CONFIG_ESP_TLS_INSECURE=y
 CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
+CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=n
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
@@ -172,3 +173,9 @@ CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 #
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/mrgc-gbm/sdkconfig b/components/retro-go/targets/mrgc-gbm/sdkconfig
@@ -149,6 +149,7 @@ CONFIG_HTTPD_MAX_URI_LEN=1024
 # Not ideal but I don't want to deal with CAs right now :(
 CONFIG_ESP_TLS_INSECURE=y
 CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
+CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=n
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
@@ -172,3 +173,8 @@ CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 #
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/odroid-go/sdkconfig b/components/retro-go/targets/odroid-go/sdkconfig
@@ -147,6 +147,7 @@ CONFIG_HTTPD_MAX_URI_LEN=1024
 # Not ideal but I don't want to deal with CAs right now :(
 CONFIG_ESP_TLS_INSECURE=y
 CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
+CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=n
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
 # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
 CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN=y
@@ -170,3 +171,9 @@ CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 #
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/qtpy-gamer/sdkconfig b/components/retro-go/targets/qtpy-gamer/sdkconfig
@@ -160,3 +160,9 @@ CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 #
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/components/retro-go/targets/retro-esp32/sdkconfig b/components/retro-go/targets/retro-esp32/sdkconfig
@@ -160,3 +160,9 @@ CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=n
 #
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+
+#
+# Silence deprecations because I have no intention of fixing them right now
+#
+CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
+CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
diff --git a/retro-core/components/nofrendo/CMakeLists.txt b/retro-core/components/nofrendo/CMakeLists.txt
@@ -2,4 +2,4 @@ set(COMPONENT_SRCDIRS "nes mappers .")
 set(COMPONENT_ADD_INCLUDEDIRS ".")
 set(COMPONENT_REQUIRES "retro-go")
 register_component()
-rg_setup_compile_options(-O3 -Wno-array-bounds -Wno-error=format)
+rg_setup_compile_options(-O3 -Wno-array-bounds -Wno-error=format -Wno-format)
diff --git a/rg_config.py b/rg_config.py
@@ -10,8 +10,8 @@
 PROJECT_ICON = "assets/icon.raw"
 PROJECT_APPS = {
   # Project name  Type, SubType, Size
-  'launcher':     [0, 0, 917504],
-  'retro-core':   [0, 0, 917504],
+  'launcher':     [0, 0, 983040],
+  'retro-core':   [0, 0, 983040],
   'prboom-go':    [0, 0, 786432],
   'gwenesis':     [0, 0, 983040],
   'fmsx':         [0, 0, 589824],