Cleaning up the build code to eventually allow multiple target devices

Author: ducalex

base.cmake

@@ -25,10 +25,6 @@ macro(rg_setup_compile_options)
         component_compile_options(-DENABLE_PROFILING -finstrument-functions)
     endif()
 
-    if($ENV{ENABLE_DEBUGGING})
-        component_compile_options(-DENABLE_DEBUGGING)
-    endif()
-
     if($ENV{ENABLE_NETPLAY})
         component_compile_options(-DENABLE_NETPLAY)
     endif()

base.sdkconfig

@@ -28,105 +28,80 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 #
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=
-CONFIG_COMPILER_CXX_EXCEPTIONS=
+# IMPORTANT: ENABLE=y adds almost 50K to the executable, can't fit in our current 2.5MB goal...
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=n
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=n
+CONFIG_COMPILER_CXX_EXCEPTIONS=n
 CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 CONFIG_COMPILER_STACK_CHECK_MODE_NORM=n
 CONFIG_COMPILER_STACK_CHECK_MODE_STRONG=n
 CONFIG_COMPILER_STACK_CHECK_MODE_ALL=n
 CONFIG_COMPILER_STACK_CHECK=n
-CONFIG_COMPILER_WARN_WRITE_STRINGS=y
-CONFIG_COMPILER_DISABLE_GCC8_WARNINGS=n
 
 #
 # SPI configuration
 #
 CONFIG_SPI_MASTER_IN_IRAM=y
 CONFIG_SPI_MASTER_ISR_IN_IRAM=y
-CONFIG_SPI_SLAVE_IN_IRAM=
-CONFIG_SPI_SLAVE_ISR_IN_IRAM=
-
 
 #
 # ESP32-specific
 #
 CONFIG_IDF_TARGET_ESP32=y
-CONFIG_ESP32_REV_MIN_0=
+CONFIG_ESP32_REV_MIN_0=n
 CONFIG_ESP32_REV_MIN_1=y
-CONFIG_ESP32_REV_MIN_2=
-CONFIG_ESP32_REV_MIN_3=
+CONFIG_ESP32_REV_MIN_2=n
+CONFIG_ESP32_REV_MIN_3=n
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DPORT_WORKAROUND=y
-CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
+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_SPIRAM_SUPPORT=y
+CONFIG_ESP32_PANIC_PRINT_HALT=n
+CONFIG_ESP32_PANIC_PRINT_REBOOT=y
+CONFIG_ESP32_PANIC_SILENT_REBOOT=n
+CONFIG_ESP32_PANIC_GDBSTUB=n
+CONFIG_ESP32_DEBUG_OCDAWARE=n
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
+CONFIG_ESP_INT_WDT=y
+CONFIG_ESP_TASK_WDT=n
 CONFIG_NEWLIB_NANO_FORMAT=y
-CONFIG_ETH_USE_ESP32_EMAC=
-CONFIG_ETH_USE_SPI_ETHERNET=
 
 #
 # SPI RAM config
 #
+CONFIG_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_USE_MEMMAP=
-CONFIG_SPIRAM_USE_CAPS_ALLOC=
+CONFIG_SPIRAM_USE_MEMMAP=n
+CONFIG_SPIRAM_USE_CAPS_ALLOC=n
 CONFIG_SPIRAM_USE_MALLOC=y
 CONFIG_SPIRAM_TYPE_AUTO=y
-CONFIG_SPIRAM_TYPE_ESPPSRAM32=
-CONFIG_SPIRAM_TYPE_ESPPSRAM64=
+CONFIG_SPIRAM_TYPE_ESPPSRAM32=n
+CONFIG_SPIRAM_TYPE_ESPPSRAM64=n
 CONFIG_SPIRAM_SIZE=-1
-CONFIG_SPIRAM_SPEED_40M=
+CONFIG_SPIRAM_SPEED_40M=n
 CONFIG_SPIRAM_SPEED_80M=y
-CONFIG_SPIRAM_MEMTEST=
-CONFIG_SPIRAM_CACHE_WORKAROUND=
-CONFIG_SPIRAM_BANKSWITCH_ENABLE=
+CONFIG_SPIRAM_MEMTEST=n
+CONFIG_SPIRAM_CACHE_WORKAROUND=n
+CONFIG_SPIRAM_BANKSWITCH_ENABLE=n
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=32768
-CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=4096
-CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=
+CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=n
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
-CONFIG_SPIRAM_OCCUPY_HSPI_HOST=
+CONFIG_SPIRAM_OCCUPY_HSPI_HOST=n
 CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
-CONFIG_SPIRAM_OCCUPY_NO_HOST=
-
-#
-# PSRAM clock and cs IO for ESP32-PICO
-#
-CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
-CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
-CONFIG_MAIN_TASK_STACK_SIZE=8192
-CONFIG_IPC_TASK_STACK_SIZE=1024
-CONFIG_TIMER_TASK_STACK_SIZE=2048
-CONFIG_ESP32_PANIC_PRINT_HALT=
-CONFIG_ESP32_PANIC_PRINT_REBOOT=y
-CONFIG_ESP32_PANIC_SILENT_REBOOT=
-CONFIG_ESP32_PANIC_GDBSTUB=
-CONFIG_ESP32_DEBUG_OCDAWARE=
-CONFIG_ESP32_DEBUG_STUBS_ENABLE=
-CONFIG_INT_WDT=
-CONFIG_TASK_WDT=
+CONFIG_SPIRAM_OCCUPY_NO_HOST=n
 
 #
 # FAT Filesystem support
 #
-CONFIG_FATFS_CODEPAGE_DYNAMIC=
 CONFIG_FATFS_CODEPAGE_437=y
 CONFIG_FATFS_CODEPAGE=437
-CONFIG_FATFS_LFN_NONE=
+CONFIG_FATFS_LFN_NONE=n
 CONFIG_FATFS_LFN_HEAP=y
-CONFIG_FATFS_LFN_STACK=
+CONFIG_FATFS_LFN_STACK=n
 CONFIG_FATFS_MAX_LFN=255
-CONFIG_FATFS_API_ENCODING_ANSI_OEM=y
-CONFIG_FATFS_API_ENCODING_UTF_16=
-CONFIG_FATFS_API_ENCODING_UTF_8=
-CONFIG_FATFS_FS_LOCK=0
-CONFIG_FATFS_TIMEOUT_MS=10000
-CONFIG_FATFS_PER_FILE_CACHE=y
-CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 
 #
 # Wear levelling
@@ -140,36 +115,17 @@ CONFIG_WL_SECTOR_MODE=1
 #
 # FreeRTOS
 #
-CONFIG_FREERTOS_UNICORE=
-CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
-CONFIG_FREERTOS_CORETIMER_0=y
-CONFIG_FREERTOS_CORETIMER_1=
 CONFIG_FREERTOS_HZ=100
-CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
-CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE=
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE=n
 CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL=y
-CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=
-CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=
-CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
-CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=n
 CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
-CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE=
-CONFIG_FREERTOS_ASSERT_DISABLE=
+CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE=n
+CONFIG_FREERTOS_ASSERT_DISABLE=n
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
-CONFIG_FREERTOS_ISR_STACKSIZE=1536
-CONFIG_FREERTOS_LEGACY_HOOKS=
-CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
-CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
-CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=
-CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
-CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048
-CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
-CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
-CONFIG_FREERTOS_USE_TRACE_FACILITY=
-CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
-CONFIG_FREERTOS_DEBUG_INTERNALS=
-CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=
-CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=
+CONFIG_FREERTOS_USE_TRACE_FACILITY=n
+CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=n
+CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=n
 
 #
 # Log output

components/retro-go/CMakeLists.txt

@@ -9,10 +9,6 @@ if($ENV{ENABLE_PROFILING})
     component_compile_options(-DENABLE_PROFILING)
 endif()
 
-if($ENV{ENABLE_DEBUGGING})
-    component_compile_options(-DENABLE_DEBUGGING)
-endif()
-
 if($ENV{ENABLE_NETPLAY})
     component_compile_options(-DENABLE_NETPLAY)
 endif()

components/retro-go/config.h

@@ -0,0 +1,39 @@
+// Video
+#define RG_SCREEN_WIDTH             (320)
+#define RG_SCREEN_HEIGHT            (240)
+
+// Battery ADC
+#define RG_BATT_CALC_PERCENT(adc) RG_MAX(0, RG_MIN(100, (RG_BATT_CALC_VOLTAGE(adc) - 3.5f) / (4.2f - 3.5f) * 100))
+#define RG_BATT_CALC_VOLTAGE(adc) ((adc) * 2.f)
+#define RG_BATT_ADC_CHAN            ADC1_CHANNEL_0
+
+// LED
+#define RG_GPIO_LED                 GPIO_NUM_2
+// Built-in gamepad
+#define RG_GPIO_GAMEPAD_X           ADC1_CHANNEL_6
+#define RG_GPIO_GAMEPAD_Y           ADC1_CHANNEL_7
+#define RG_GPIO_GAMEPAD_SELECT      GPIO_NUM_27
+#define RG_GPIO_GAMEPAD_START       GPIO_NUM_39
+#define RG_GPIO_GAMEPAD_A           GPIO_NUM_32
+#define RG_GPIO_GAMEPAD_B           GPIO_NUM_33
+#define RG_GPIO_GAMEPAD_MENU        GPIO_NUM_13
+#define RG_GPIO_GAMEPAD_VOLUME      GPIO_NUM_0
+// SNES-style gamepad
+#define RG_GPIO_GAMEPAD_LATCH       GPIO_NUM_15
+#define RG_GPIO_GAMEPAD_CLOCK       GPIO_NUM_12
+#define RG_GPIO_GAMEPAD_DATA        GPIO_NUM_4
+// SPI BUS
+#define RG_GPIO_LCD_MISO            GPIO_NUM_19
+#define RG_GPIO_LCD_MOSI            GPIO_NUM_23
+#define RG_GPIO_LCD_CLK             GPIO_NUM_18
+#define RG_GPIO_LCD_CS              GPIO_NUM_5
+#define RG_GPIO_LCD_DC              GPIO_NUM_21
+#define RG_GPIO_LCD_BCKL            GPIO_NUM_14
+#define RG_GPIO_SD_MISO             GPIO_NUM_19
+#define RG_GPIO_SD_MOSI             GPIO_NUM_23
+#define RG_GPIO_SD_CLK              GPIO_NUM_18
+#define RG_GPIO_SD_CS               GPIO_NUM_22
+// External I2S DAC
+#define RG_GPIO_EXT_I2S_DAC_BCK     GPIO_NUM_4
+#define RG_GPIO_EXT_I2S_DAC_WS      GPIO_NUM_12
+#define RG_GPIO_EXT_I2S_DAC_DATA    GPIO_NUM_15