Update board menu for ESP32-S3

Author: me-no-dev

boards.txt

@@ -58,40 +58,47 @@ esp32s3.build.partitions=default
 esp32s3.build.defines=
 esp32s3.build.loop_core=
 esp32s3.build.event_core=
-esp32s3.build.memory_type=qspi_qspi
+esp32s3.build.flash_type=qspi
+esp32s3.build.psram_type=qspi
+esp32s3.build.memory_type={build.flash_type}_{build.psram_type}
 
-esp32s3.menu.MemoryType.default=QSPI Flash and PSRAM
-esp32s3.menu.MemoryType.default.build.memory_type=qspi_qspi
-esp32s3.menu.MemoryType.qspi_opi=QSPI Flash and OPI PSRAM
-esp32s3.menu.MemoryType.qspi_opi.build.memory_type=qspi_opi
-esp32s3.menu.MemoryType.opi_opi=OPI Flash and PSRAM
-esp32s3.menu.MemoryType.opi_opi.build.memory_type=opi_opi
+#esp32s3.menu.MemoryType.default=QSPI Flash and PSRAM
+#esp32s3.menu.MemoryType.default.build.memory_type=qspi_qspi
+#esp32s3.menu.MemoryType.qspi_opi=QSPI Flash and OPI PSRAM
+#esp32s3.menu.MemoryType.qspi_opi.build.memory_type=qspi_opi
+#esp32s3.menu.MemoryType.opi_opi=OPI Flash and PSRAM
+#esp32s3.menu.MemoryType.opi_opi.build.memory_type=opi_opi
 
 esp32s3.menu.PSRAM.disabled=Disabled
 esp32s3.menu.PSRAM.disabled.build.defines=
-esp32s3.menu.PSRAM.enabled=Enabled
+esp32s3.menu.PSRAM.disabled.build.psram_type=qspi
+esp32s3.menu.PSRAM.enabled=QSPI PSRAM
 esp32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+esp32s3.menu.PSRAM.enabled.build.psram_type=qspi
+esp32s3.menu.PSRAM.opi=OPI PSRAM
+esp32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+esp32s3.menu.PSRAM.opi.build.psram_type=opi
 
-esp32s3.menu.FlashMode.qio=QIO
+esp32s3.menu.FlashMode.qio=QIO 80MHz
 esp32s3.menu.FlashMode.qio.build.flash_mode=dio
 esp32s3.menu.FlashMode.qio.build.boot=qio
-esp32s3.menu.FlashMode.dio=DIO
+esp32s3.menu.FlashMode.qio.build.flash_freq=80m
+esp32s3.menu.FlashMode.qio.build.flash_type=qspi
+esp32s3.menu.FlashMode.qio120=QIO 120MHz
+esp32s3.menu.FlashMode.qio120.build.flash_mode=dio
+esp32s3.menu.FlashMode.qio120.build.boot=qio
+esp32s3.menu.FlashMode.qio120.build.flash_freq=120m
+esp32s3.menu.FlashMode.qio120.build.flash_type=qspi
+esp32s3.menu.FlashMode.dio=DIO 80MHz
 esp32s3.menu.FlashMode.dio.build.flash_mode=dio
 esp32s3.menu.FlashMode.dio.build.boot=dio
-esp32s3.menu.FlashMode.qout=QOUT
-esp32s3.menu.FlashMode.qout.build.flash_mode=dout
-esp32s3.menu.FlashMode.qout.build.boot=qout
-esp32s3.menu.FlashMode.dout=DOUT
-esp32s3.menu.FlashMode.dout.build.flash_mode=dout
-esp32s3.menu.FlashMode.dout.build.boot=dout
-esp32s3.menu.FlashMode.opi=OPI
+esp32s3.menu.FlashMode.dio.build.flash_freq=80m
+esp32s3.menu.FlashMode.dio.build.flash_type=qspi
+esp32s3.menu.FlashMode.opi=OPI 80MHz
 esp32s3.menu.FlashMode.opi.build.flash_mode=dout
 esp32s3.menu.FlashMode.opi.build.boot=opi
-
-esp32s3.menu.FlashFreq.80=80MHz
-esp32s3.menu.FlashFreq.80.build.flash_freq=80m
-esp32s3.menu.FlashFreq.40=40MHz
-esp32s3.menu.FlashFreq.40.build.flash_freq=40m
+esp32s3.menu.FlashMode.opi.build.flash_freq=80m
+esp32s3.menu.FlashMode.opi.build.flash_type=opi
 
 esp32s3.menu.FlashSize.4M=4MB (32Mb)
 esp32s3.menu.FlashSize.4M.build.flash_size=4MB