Tue Jan 5 12:54:02 EST 2021 - prep for 2.8 fix #82

Author: 32teeth

Emulators/handy-go/sdkconfig

@@ -83,12 +83,12 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=y
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
 CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
 CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=
-CONFIG_DEFAULT_MENU_KEY=
-CONFIG_COMBO_MENU_KEY=y
+CONFIG_DEFAULT_MENU_KEY=y
+CONFIG_COMBO_MENU_KEY=
 CONFIG_IN_GAME_MENU_YES=y
 CONFIG_IN_GAME_MENU_NO=
 
@@ -168,11 +168,7 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
-<<<<<<< HEAD
-CONFIG_SPIRAM_SUPPORT=
-=======
 CONFIG_SPIRAM_SUPPORT=y
->>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
 
 #
 # SPI RAM config

Launchers/retro-esp32/sdkconfig

@@ -83,8 +83,8 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=y
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
 CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
 CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=
 CONFIG_DEFAULT_MENU_KEY=y
@@ -176,13 +176,13 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=
 CONFIG_SPIRAM_USE_MEMMAP=
 CONFIG_SPIRAM_USE_CAPS_ALLOC=y
 CONFIG_SPIRAM_USE_MALLOC=
-CONFIG_SPIRAM_TYPE_AUTO=
+CONFIG_SPIRAM_TYPE_AUTO=y
 CONFIG_SPIRAM_TYPE_ESPPSRAM32=
-CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
-CONFIG_SPIRAM_SIZE=8388608
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=
+CONFIG_SPIRAM_SIZE=-1
 CONFIG_SPIRAM_SPEED_40M=
 CONFIG_SPIRAM_SPEED_80M=y
-CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MEMTEST=
 CONFIG_SPIRAM_CACHE_WORKAROUND=
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=
 CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=