From 212a3c7d1f5d333146cd104ffe52777592950e74 Mon Sep 17 00:00:00 2001
From: Larry Bernstone <lbernstone@gmail.com>
Date: Thu, 21 Sep 2023 11:17:02 -1000
Subject: [PATCH 1/4] Added entry for octal flash S3

---
 boards.txt | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 207 insertions(+)

diff --git a/boards.txt b/boards.txt
index b597b0946bb..f9fb69ddee8 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1155,6 +1155,213 @@ pico32.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+esp32s3-octal.name=ESP32S3 Dev Module Octal (WROOM2)
+esp32s3-octal.vid.0=0x303a
+esp32s3-octal.pid.0=0x1001
+esp32s3-octal.bootloader.tool=esptool_py
+esp32s3-octal.bootloader.tool.default=esptool_py
+esp32s3-octal.upload.tool=esptool_py
+esp32s3-octal.upload.tool.default=esptool_py
+esp32s3-octal.upload.tool.network=esp_ota
+esp32s3-octal.upload.maximum_size=1310720
+esp32s3-octal.upload.maximum_data_size=327680
+esp32s3-octal.upload.flags=
+esp32s3-octal.upload.extra_flags=
+esp32s3-octal.upload.use_1200bps_touch=false
+esp32s3-octal.upload.wait_for_upload_port=false
+esp32s3-octal.serial.disableDTR=false
+esp32s3-octal.serial.disableRTS=false
+esp32s3-octal.build.tarch=xtensa
+esp32s3-octal.build.bootloader_addr=0x0
+esp32s3-octal.build.target=esp32s3
+esp32s3-octal.build.mcu=esp32s3
+esp32s3-octal.build.core=esp32
+esp32s3-octal.build.variant=esp32s3
+esp32s3-octal.build.board=ESP32S3_DEV
+esp32s3-octal.build.usb_mode=1
+esp32s3-octal.build.cdc_on_boot=0
+esp32s3-octal.build.msc_on_boot=0
+esp32s3-octal.build.dfu_on_boot=0
+esp32s3-octal.build.f_cpu=240000000L
+esp32s3-octal.build.flash_size=4MB
+esp32s3-octal.build.flash_freq=80m
+esp32s3-octal.build.flash_mode=dio
+esp32s3-octal.build.boot=opi
+esp32s3-octal.build.boot_freq=80m
+esp32s3-octal.build.partitions=default
+esp32s3-octal.build.defines=
+esp32s3-octal.build.loop_core=
+esp32s3-octal.build.event_core=
+esp32s3-octal.build.psram_type=opi
+esp32s3-octal.build.memory_type={build.boot}_{build.psram_type}
+esp32s3-octal.menu.JTAGAdapter.default=Disabled
+esp32s3-octal.menu.JTAGAdapter.default.build.copy_jtag_files=0
+esp32s3-octal.menu.JTAGAdapter.builtin=Integrated USB JTAG
+esp32s3-octal.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
+esp32s3-octal.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+esp32s3-octal.menu.JTAGAdapter.external=FTDI Adapter
+esp32s3-octal.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
+esp32s3-octal.menu.JTAGAdapter.external.build.copy_jtag_files=1
+esp32s3-octal.menu.JTAGAdapter.bridge=ESP USB Bridge
+esp32s3-octal.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
+esp32s3-octal.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+esp32s3-octal.menu.PSRAM.opi=OPI PSRAM
+esp32s3-octal.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+esp32s3-octal.menu.PSRAM.opi.build.psram_type=opi
+esp32s3-octal.menu.PSRAM.enabled=QSPI PSRAM
+esp32s3-octal.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+esp32s3-octal.menu.PSRAM.enabled.build.psram_type=qspi
+esp32s3-octal.menu.PSRAM.disabled=Disabled
+esp32s3-octal.menu.PSRAM.disabled.build.defines=
+esp32s3-octal.menu.PSRAM.disabled.build.psram_type=qspi
+esp32s3-octal.menu.FlashMode.opi=OPI 80MHz
+esp32s3-octal.menu.FlashMode.opi.build.flash_mode=dout
+esp32s3-octal.menu.FlashMode.opi.build.boot=opi
+esp32s3-octal.menu.FlashMode.opi.build.boot_freq=80m
+esp32s3-octal.menu.FlashMode.opi.build.flash_freq=80m
+esp32s3-octal.menu.FlashSize.4M=4MB (32Mb)
+esp32s3-octal.menu.FlashMode.qio=QIO 80MHz
+esp32s3-octal.menu.FlashMode.qio.build.flash_mode=dio
+esp32s3-octal.menu.FlashMode.qio.build.boot=qio
+esp32s3-octal.menu.FlashMode.qio.build.boot_freq=80m
+esp32s3-octal.menu.FlashMode.qio.build.flash_freq=80m
+esp32s3-octal.menu.FlashMode.qio120=QIO 120MHz
+esp32s3-octal.menu.FlashMode.qio120.build.flash_mode=dio
+esp32s3-octal.menu.FlashMode.qio120.build.boot=qio
+esp32s3-octal.menu.FlashMode.qio120.build.boot_freq=120m
+esp32s3-octal.menu.FlashMode.qio120.build.flash_freq=80m
+esp32s3-octal.menu.FlashMode.dio=DIO 80MHz
+esp32s3-octal.menu.FlashMode.dio.build.flash_mode=dio
+esp32s3-octal.menu.FlashMode.dio.build.boot=dio
+esp32s3-octal.menu.FlashMode.dio.build.boot_freq=80m
+esp32s3-octal.menu.FlashMode.dio.build.flash_freq=80m
+esp32s3-octal.menu.FlashSize.4M=4MB (32Mb)
+esp32s3-octal.menu.FlashSize.4M.build.flash_size=4MB
+esp32s3-octal.menu.FlashSize.8M=8MB (64Mb)
+esp32s3-octal.menu.FlashSize.8M.build.flash_size=8MB
+esp32s3-octal.menu.FlashSize.8M.build.partitions=default_8MB
+esp32s3-octal.menu.FlashSize.16M=16MB (128Mb)
+esp32s3-octal.menu.FlashSize.16M.build.flash_size=16MB
+esp32s3-octal.menu.FlashSize.32M=32MB (256Mb)
+esp32s3-octal.menu.FlashSize.32M.build.flash_size=32MB
+esp32s3-octal.menu.FlashSize.32M.build.partitions=app5M_fat24M_32MB
+esp32s3-octal.menu.LoopCore.1=Core 1
+esp32s3-octal.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+esp32s3-octal.menu.LoopCore.0=Core 0
+esp32s3-octal.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+esp32s3-octal.menu.EventsCore.1=Core 1
+esp32s3-octal.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+esp32s3-octal.menu.EventsCore.0=Core 0
+esp32s3-octal.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+esp32s3-octal.menu.USBMode.hwcdc=Hardware CDC and JTAG
+esp32s3-octal.menu.USBMode.hwcdc.build.usb_mode=1
+esp32s3-octal.menu.USBMode.default=USB-OTG (TinyUSB)
+esp32s3-octal.menu.USBMode.default.build.usb_mode=0
+esp32s3-octal.menu.CDCOnBoot.default=Disabled
+esp32s3-octal.menu.CDCOnBoot.default.build.cdc_on_boot=0
+esp32s3-octal.menu.CDCOnBoot.cdc=Enabled
+esp32s3-octal.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+esp32s3-octal.menu.MSCOnBoot.default=Disabled
+esp32s3-octal.menu.MSCOnBoot.default.build.msc_on_boot=0
+esp32s3-octal.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+esp32s3-octal.menu.MSCOnBoot.msc.build.msc_on_boot=1
+esp32s3-octal.menu.DFUOnBoot.default=Disabled
+esp32s3-octal.menu.DFUOnBoot.default.build.dfu_on_boot=0
+esp32s3-octal.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+esp32s3-octal.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+esp32s3-octal.menu.UploadMode.default=UART0 / Hardware CDC
+esp32s3-octal.menu.UploadMode.default.upload.use_1200bps_touch=false
+esp32s3-octal.menu.UploadMode.default.upload.wait_for_upload_port=false
+esp32s3-octal.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+esp32s3-octal.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+esp32s3-octal.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+esp32s3-octal.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.default.build.partitions=default
+esp32s3-octal.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+esp32s3-octal.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+esp32s3-octal.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+esp32s3-octal.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+esp32s3-octal.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.minimal.build.partitions=minimal
+esp32s3-octal.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32s3-octal.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32s3-octal.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+esp32s3-octal.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+esp32s3-octal.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+esp32s3-octal.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+esp32s3-octal.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+esp32s3-octal.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+esp32s3-octal.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+esp32s3-octal.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+esp32s3-octal.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.huge_app.build.partitions=huge_app
+esp32s3-octal.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+esp32s3-octal.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+esp32s3-octal.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32s3-octal.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+esp32s3-octal.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+esp32s3-octal.menu.PartitionScheme.fatflash.build.partitions=ffat
+esp32s3-octal.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+esp32s3-octal.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+esp32s3-octal.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+esp32s3-octal.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+esp32s3-octal.menu.PartitionScheme.rainmaker=RainMaker
+esp32s3-octal.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+esp32s3-octal.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+esp32s3-octal.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
+esp32s3-octal.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
+esp32s3-octal.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
+esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
+esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
+esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
+esp32s3-octal.menu.CPUFreq.240=240MHz (WiFi)
+esp32s3-octal.menu.CPUFreq.240.build.f_cpu=240000000L
+esp32s3-octal.menu.CPUFreq.160=160MHz (WiFi)
+esp32s3-octal.menu.CPUFreq.160.build.f_cpu=160000000L
+esp32s3-octal.menu.CPUFreq.80=80MHz (WiFi)
+esp32s3-octal.menu.CPUFreq.80.build.f_cpu=80000000L
+esp32s3-octal.menu.CPUFreq.40=40MHz
+esp32s3-octal.menu.CPUFreq.40.build.f_cpu=40000000L
+esp32s3-octal.menu.CPUFreq.20=20MHz
+esp32s3-octal.menu.CPUFreq.20.build.f_cpu=20000000L
+esp32s3-octal.menu.CPUFreq.10=10MHz
+esp32s3-octal.menu.CPUFreq.10.build.f_cpu=10000000L
+esp32s3-octal.menu.UploadSpeed.921600=921600
+esp32s3-octal.menu.UploadSpeed.921600.upload.speed=921600
+esp32s3-octal.menu.UploadSpeed.115200=115200
+esp32s3-octal.menu.UploadSpeed.115200.upload.speed=115200
+esp32s3-octal.menu.UploadSpeed.256000.windows=256000
+esp32s3-octal.menu.UploadSpeed.256000.upload.speed=256000
+esp32s3-octal.menu.UploadSpeed.230400.windows.upload.speed=256000
+esp32s3-octal.menu.UploadSpeed.230400=230400
+esp32s3-octal.menu.UploadSpeed.230400.upload.speed=230400
+esp32s3-octal.menu.UploadSpeed.460800.linux=460800
+esp32s3-octal.menu.UploadSpeed.460800.macosx=460800
+esp32s3-octal.menu.UploadSpeed.460800.upload.speed=460800
+esp32s3-octal.menu.UploadSpeed.512000.windows=512000
+esp32s3-octal.menu.UploadSpeed.512000.upload.speed=512000
+esp32s3-octal.menu.DebugLevel.none=None
+esp32s3-octal.menu.DebugLevel.none.build.code_debug=0
+esp32s3-octal.menu.DebugLevel.error=Error
+esp32s3-octal.menu.DebugLevel.error.build.code_debug=1
+esp32s3-octal.menu.DebugLevel.warn=Warn
+esp32s3-octal.menu.DebugLevel.warn.build.code_debug=2
+esp32s3-octal.menu.DebugLevel.info=Info
+esp32s3-octal.menu.DebugLevel.info.build.code_debug=3
+esp32s3-octal.menu.DebugLevel.debug=Debug
+esp32s3-octal.menu.DebugLevel.debug.build.code_debug=4
+esp32s3-octal.menu.DebugLevel.verbose=Verbose
+esp32s3-octal.menu.DebugLevel.verbose.build.code_debug=5
+esp32s3-octal.menu.EraseFlash.none=Disabled
+esp32s3-octal.menu.EraseFlash.none.upload.erase_cmd=
+esp32s3-octal.menu.EraseFlash.all=Enabled
+esp32s3-octal.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 esp32s3box.name=ESP32-S3-Box
 esp32s3box.vid.0=0x303a
 esp32s3box.pid.0=0x1001

From 9a5f49699c8a0b3faad4c5fc682c9bce169dc624 Mon Sep 17 00:00:00 2001
From: Larry Bernstone <lbernstone@gmail.com>
Date: Thu, 21 Sep 2023 12:11:16 -1000
Subject: [PATCH 2/4] Default flash size should be 16M for WROOM2

---
 boards.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/boards.txt b/boards.txt
index f9fb69ddee8..932ea3a0b16 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1219,7 +1219,6 @@ esp32s3-octal.menu.FlashMode.opi.build.flash_mode=dout
 esp32s3-octal.menu.FlashMode.opi.build.boot=opi
 esp32s3-octal.menu.FlashMode.opi.build.boot_freq=80m
 esp32s3-octal.menu.FlashMode.opi.build.flash_freq=80m
-esp32s3-octal.menu.FlashSize.4M=4MB (32Mb)
 esp32s3-octal.menu.FlashMode.qio=QIO 80MHz
 esp32s3-octal.menu.FlashMode.qio.build.flash_mode=dio
 esp32s3-octal.menu.FlashMode.qio.build.boot=qio
@@ -1235,6 +1234,7 @@ esp32s3-octal.menu.FlashMode.dio.build.flash_mode=dio
 esp32s3-octal.menu.FlashMode.dio.build.boot=dio
 esp32s3-octal.menu.FlashMode.dio.build.boot_freq=80m
 esp32s3-octal.menu.FlashMode.dio.build.flash_freq=80m
+esp32s3-octal.menu.FlashSize.16M=16MB (128Mb)
 esp32s3-octal.menu.FlashSize.4M=4MB (32Mb)
 esp32s3-octal.menu.FlashSize.4M.build.flash_size=4MB
 esp32s3-octal.menu.FlashSize.8M=8MB (64Mb)
@@ -1275,6 +1275,7 @@ esp32s3-octal.menu.UploadMode.default.upload.wait_for_upload_port=false
 esp32s3-octal.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 esp32s3-octal.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 esp32s3-octal.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+esp32s3-octal.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
 esp32s3-octal.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
 esp32s3-octal.menu.PartitionScheme.default.build.partitions=default
 esp32s3-octal.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)

From b4cb5d50bf63069698682f506be8f457be5fcc2e Mon Sep 17 00:00:00 2001
From: Larry Bernstone <lbernstone@gmail.com>
Date: Wed, 4 Oct 2023 11:06:06 -1000
Subject: [PATCH 3/4] Added CRs

---
 boards.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/boards.txt b/boards.txt
index 932ea3a0b16..d4e1fb92802 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1158,8 +1158,10 @@ pico32.menu.EraseFlash.all.upload.erase_cmd=-e
 esp32s3-octal.name=ESP32S3 Dev Module Octal (WROOM2)
 esp32s3-octal.vid.0=0x303a
 esp32s3-octal.pid.0=0x1001
+
 esp32s3-octal.bootloader.tool=esptool_py
 esp32s3-octal.bootloader.tool.default=esptool_py
+
 esp32s3-octal.upload.tool=esptool_py
 esp32s3-octal.upload.tool.default=esptool_py
 esp32s3-octal.upload.tool.network=esp_ota
@@ -1169,8 +1171,10 @@ esp32s3-octal.upload.flags=
 esp32s3-octal.upload.extra_flags=
 esp32s3-octal.upload.use_1200bps_touch=false
 esp32s3-octal.upload.wait_for_upload_port=false
+
 esp32s3-octal.serial.disableDTR=false
 esp32s3-octal.serial.disableRTS=false
+
 esp32s3-octal.build.tarch=xtensa
 esp32s3-octal.build.bootloader_addr=0x0
 esp32s3-octal.build.target=esp32s3
@@ -1178,6 +1182,7 @@ esp32s3-octal.build.mcu=esp32s3
 esp32s3-octal.build.core=esp32
 esp32s3-octal.build.variant=esp32s3
 esp32s3-octal.build.board=ESP32S3_DEV
+
 esp32s3-octal.build.usb_mode=1
 esp32s3-octal.build.cdc_on_boot=0
 esp32s3-octal.build.msc_on_boot=0
@@ -1186,6 +1191,7 @@ esp32s3-octal.build.f_cpu=240000000L
 esp32s3-octal.build.flash_size=4MB
 esp32s3-octal.build.flash_freq=80m
 esp32s3-octal.build.flash_mode=dio
+
 esp32s3-octal.build.boot=opi
 esp32s3-octal.build.boot_freq=80m
 esp32s3-octal.build.partitions=default
@@ -1194,6 +1200,7 @@ esp32s3-octal.build.loop_core=
 esp32s3-octal.build.event_core=
 esp32s3-octal.build.psram_type=opi
 esp32s3-octal.build.memory_type={build.boot}_{build.psram_type}
+
 esp32s3-octal.menu.JTAGAdapter.default=Disabled
 esp32s3-octal.menu.JTAGAdapter.default.build.copy_jtag_files=0
 esp32s3-octal.menu.JTAGAdapter.builtin=Integrated USB JTAG
@@ -1205,6 +1212,7 @@ esp32s3-octal.menu.JTAGAdapter.external.build.copy_jtag_files=1
 esp32s3-octal.menu.JTAGAdapter.bridge=ESP USB Bridge
 esp32s3-octal.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
 esp32s3-octal.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
 esp32s3-octal.menu.PSRAM.opi=OPI PSRAM
 esp32s3-octal.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
 esp32s3-octal.menu.PSRAM.opi.build.psram_type=opi
@@ -1214,6 +1222,7 @@ esp32s3-octal.menu.PSRAM.enabled.build.psram_type=qspi
 esp32s3-octal.menu.PSRAM.disabled=Disabled
 esp32s3-octal.menu.PSRAM.disabled.build.defines=
 esp32s3-octal.menu.PSRAM.disabled.build.psram_type=qspi
+
 esp32s3-octal.menu.FlashMode.opi=OPI 80MHz
 esp32s3-octal.menu.FlashMode.opi.build.flash_mode=dout
 esp32s3-octal.menu.FlashMode.opi.build.boot=opi
@@ -1234,6 +1243,7 @@ esp32s3-octal.menu.FlashMode.dio.build.flash_mode=dio
 esp32s3-octal.menu.FlashMode.dio.build.boot=dio
 esp32s3-octal.menu.FlashMode.dio.build.boot_freq=80m
 esp32s3-octal.menu.FlashMode.dio.build.flash_freq=80m
+
 esp32s3-octal.menu.FlashSize.16M=16MB (128Mb)
 esp32s3-octal.menu.FlashSize.4M=4MB (32Mb)
 esp32s3-octal.menu.FlashSize.4M.build.flash_size=4MB
@@ -1245,36 +1255,44 @@ esp32s3-octal.menu.FlashSize.16M.build.flash_size=16MB
 esp32s3-octal.menu.FlashSize.32M=32MB (256Mb)
 esp32s3-octal.menu.FlashSize.32M.build.flash_size=32MB
 esp32s3-octal.menu.FlashSize.32M.build.partitions=app5M_fat24M_32MB
+
 esp32s3-octal.menu.LoopCore.1=Core 1
 esp32s3-octal.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
 esp32s3-octal.menu.LoopCore.0=Core 0
 esp32s3-octal.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
 esp32s3-octal.menu.EventsCore.1=Core 1
 esp32s3-octal.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
 esp32s3-octal.menu.EventsCore.0=Core 0
 esp32s3-octal.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
 esp32s3-octal.menu.USBMode.hwcdc=Hardware CDC and JTAG
 esp32s3-octal.menu.USBMode.hwcdc.build.usb_mode=1
 esp32s3-octal.menu.USBMode.default=USB-OTG (TinyUSB)
 esp32s3-octal.menu.USBMode.default.build.usb_mode=0
+
 esp32s3-octal.menu.CDCOnBoot.default=Disabled
 esp32s3-octal.menu.CDCOnBoot.default.build.cdc_on_boot=0
 esp32s3-octal.menu.CDCOnBoot.cdc=Enabled
 esp32s3-octal.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
 esp32s3-octal.menu.MSCOnBoot.default=Disabled
 esp32s3-octal.menu.MSCOnBoot.default.build.msc_on_boot=0
 esp32s3-octal.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
 esp32s3-octal.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
 esp32s3-octal.menu.DFUOnBoot.default=Disabled
 esp32s3-octal.menu.DFUOnBoot.default.build.dfu_on_boot=0
 esp32s3-octal.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
 esp32s3-octal.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
 esp32s3-octal.menu.UploadMode.default=UART0 / Hardware CDC
 esp32s3-octal.menu.UploadMode.default.upload.use_1200bps_touch=false
 esp32s3-octal.menu.UploadMode.default.upload.wait_for_upload_port=false
 esp32s3-octal.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 esp32s3-octal.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 esp32s3-octal.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
 esp32s3-octal.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
 esp32s3-octal.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
 esp32s3-octal.menu.PartitionScheme.default.build.partitions=default
@@ -1318,6 +1336,7 @@ esp32s3-octal.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
 esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
 esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
 esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
+
 esp32s3-octal.menu.CPUFreq.240=240MHz (WiFi)
 esp32s3-octal.menu.CPUFreq.240.build.f_cpu=240000000L
 esp32s3-octal.menu.CPUFreq.160=160MHz (WiFi)
@@ -1330,6 +1349,7 @@ esp32s3-octal.menu.CPUFreq.20=20MHz
 esp32s3-octal.menu.CPUFreq.20.build.f_cpu=20000000L
 esp32s3-octal.menu.CPUFreq.10=10MHz
 esp32s3-octal.menu.CPUFreq.10.build.f_cpu=10000000L
+
 esp32s3-octal.menu.UploadSpeed.921600=921600
 esp32s3-octal.menu.UploadSpeed.921600.upload.speed=921600
 esp32s3-octal.menu.UploadSpeed.115200=115200
@@ -1344,6 +1364,7 @@ esp32s3-octal.menu.UploadSpeed.460800.macosx=460800
 esp32s3-octal.menu.UploadSpeed.460800.upload.speed=460800
 esp32s3-octal.menu.UploadSpeed.512000.windows=512000
 esp32s3-octal.menu.UploadSpeed.512000.upload.speed=512000
+
 esp32s3-octal.menu.DebugLevel.none=None
 esp32s3-octal.menu.DebugLevel.none.build.code_debug=0
 esp32s3-octal.menu.DebugLevel.error=Error

From b67cad224e0007b0840cfb1f8f13160b554302a4 Mon Sep 17 00:00:00 2001
From: lbernstone <lbernstone@gmail.com>
Date: Mon, 23 Oct 2023 06:45:19 -1000
Subject: [PATCH 4/4] One more CR

---
 boards.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boards.txt b/boards.txt
index f19cbc2d4aa..d875870deef 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1727,6 +1727,7 @@ esp32s3-octal.menu.DebugLevel.debug=Debug
 esp32s3-octal.menu.DebugLevel.debug.build.code_debug=4
 esp32s3-octal.menu.DebugLevel.verbose=Verbose
 esp32s3-octal.menu.DebugLevel.verbose.build.code_debug=5
+
 esp32s3-octal.menu.EraseFlash.none=Disabled
 esp32s3-octal.menu.EraseFlash.none.upload.erase_cmd=
 esp32s3-octal.menu.EraseFlash.all=Enabled