WIP: Initial OPI support

Author: me-no-dev

boards.txt

@@ -16,6 +16,7 @@ menu.LORAWAN_REGION=LoRaWan Region
 menu.LoRaWanDebugLevel=LoRaWan Debug Level
 menu.LoopCore=Arduino Runs On
 menu.EventsCore=Events Run On
+menu.MemoryType=Memory Type
 
 ##############################################################
 ### DO NOT PUT BOARDS ABOVE THE OFFICIAL ESPRESSIF BOARDS! ###
@@ -55,9 +56,52 @@ esp32s3.build.flash_mode=dio
 esp32s3.build.boot=qio
 esp32s3.build.partitions=default
 esp32s3.build.defines=
-esp32s3.build.extra_libs="-L{compiler.sdk.path}/lib/spiram"
 esp32s3.build.loop_core=
 esp32s3.build.event_core=
+esp32s3.build.memory_type=qspi_qspi
+
+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.enabled.build.defines=-DBOARD_HAS_PSRAM
+
+esp32s3.menu.FlashMode.qio=QIO
+esp32s3.menu.FlashMode.qio.build.flash_mode=dio
+esp32s3.menu.FlashMode.qio.build.boot=qio
+esp32s3.menu.FlashMode.dio=DIO
+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.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.FlashSize.4M=4MB (32Mb)
+esp32s3.menu.FlashSize.4M.build.flash_size=4MB
+esp32s3.menu.FlashSize.8M=8MB (64Mb)
+esp32s3.menu.FlashSize.8M.build.flash_size=8MB
+esp32s3.menu.FlashSize.8M.build.partitions=default_8MB
+esp32s3.menu.FlashSize.16M=16MB (128Mb)
+esp32s3.menu.FlashSize.16M.build.flash_size=16MB
+esp32s3.menu.FlashSize.32M=32MB (256Mb)
+esp32s3.menu.FlashSize.32M.build.flash_size=32MB
 
 esp32s3.menu.LoopCore.1=Core 1
 esp32s3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
@@ -96,16 +140,6 @@ esp32s3.menu.UploadMode.cdc=Internal USB
 esp32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 esp32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
-esp32s3.menu.PSRAM.disabled=Disabled
-esp32s3.menu.PSRAM.disabled.build.defines=
-esp32s3.menu.PSRAM.disabled.build.extra_libs="-L{compiler.sdk.path}/lib/spiram"
-esp32s3.menu.PSRAM.qspi=QSPI
-esp32s3.menu.PSRAM.qspi.build.defines=-DBOARD_HAS_PSRAM
-esp32s3.menu.PSRAM.qspi.build.extra_libs="-L{compiler.sdk.path}/lib/spiram"
-esp32s3.menu.PSRAM.opi=OPI
-esp32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM -DCONFIG_SPIRAM_BOOT_INIT -DCONFIG_SPIRAM_MODE_OCT=1
-esp32s3.menu.PSRAM.opi.build.extra_libs="-L{compiler.sdk.path}/lib/opiram"
-
 esp32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
 esp32s3.menu.PartitionScheme.default.build.partitions=default
 esp32s3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -153,35 +187,6 @@ esp32s3.menu.CPUFreq.20.build.f_cpu=20000000L
 esp32s3.menu.CPUFreq.10=10MHz
 esp32s3.menu.CPUFreq.10.build.f_cpu=10000000L
 
-esp32s3.menu.FlashMode.qio=QIO
-esp32s3.menu.FlashMode.qio.build.flash_mode=dio
-esp32s3.menu.FlashMode.qio.build.boot=qio
-esp32s3.menu.FlashMode.dio=DIO
-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.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.FlashSize.4M=4MB (32Mb)
-esp32s3.menu.FlashSize.4M.build.flash_size=4MB
-esp32s3.menu.FlashSize.8M=8MB (64Mb)
-esp32s3.menu.FlashSize.8M.build.flash_size=8MB
-esp32s3.menu.FlashSize.8M.build.partitions=default_8MB
-esp32s3.menu.FlashSize.2M=2MB (16Mb)
-esp32s3.menu.FlashSize.2M.build.flash_size=2MB
-esp32s3.menu.FlashSize.2M.build.partitions=minimal
-esp32s3.menu.FlashSize.16M=16MB (128Mb)
-esp32s3.menu.FlashSize.16M.build.flash_size=16MB
-
 esp32s3.menu.UploadSpeed.921600=921600
 esp32s3.menu.UploadSpeed.921600.upload.speed=921600
 esp32s3.menu.UploadSpeed.115200=115200
@@ -884,8 +889,8 @@ esp32s3box.build.flash_freq=80m
 esp32s3box.build.flash_mode=dio
 esp32s3box.build.boot=qio
 esp32s3box.build.partitions=default
-esp32s3box.build.extra_libs="-L{compiler.sdk.path}/lib/opiram"
-esp32s3box.build.defines=-DBOARD_HAS_PSRAM -DCONFIG_SPIRAM_BOOT_INIT -DCONFIG_SPIRAM_MODE_OCT=1
+esp32s3box.build.defines=-DBOARD_HAS_PSRAM
+esp32s3box.build.memory_type=qspi_opi
 esp32s3box.build.loop_core=-DARDUINO_RUNNING_CORE=1
 esp32s3box.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
 
@@ -955,6 +960,118 @@ esp32s3box.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+esp32s3camlcd.name=ESP32S3 CAM LCD
+esp32s3camlcd.vid.0=0x303a
+esp32s3camlcd.pid.0=0x1001
+
+esp32s3camlcd.upload.tool=esptool_py
+esp32s3camlcd.upload.maximum_size=1310720
+esp32s3camlcd.upload.maximum_data_size=327680
+esp32s3camlcd.upload.flags=
+esp32s3camlcd.upload.extra_flags=
+esp32s3camlcd.upload.use_1200bps_touch=false
+esp32s3camlcd.upload.wait_for_upload_port=false
+
+esp32s3camlcd.serial.disableDTR=false
+esp32s3camlcd.serial.disableRTS=false
+
+esp32s3camlcd.build.tarch=xtensa
+esp32s3camlcd.build.bootloader_addr=0x0
+esp32s3camlcd.build.target=esp32s3
+esp32s3camlcd.build.mcu=esp32s3
+esp32s3camlcd.build.core=esp32
+esp32s3camlcd.build.variant=esp32s3camlcd
+esp32s3camlcd.build.board=ESP32S3_CAM_LCD
+
+esp32s3camlcd.build.usb_mode=1
+esp32s3camlcd.build.cdc_on_boot=0
+esp32s3camlcd.build.msc_on_boot=0
+esp32s3camlcd.build.dfu_on_boot=0
+esp32s3camlcd.build.f_cpu=240000000L
+esp32s3camlcd.build.flash_size=4MB
+esp32s3camlcd.build.flash_freq=80m
+esp32s3camlcd.build.flash_mode=dout
+esp32s3camlcd.build.boot=opi
+esp32s3camlcd.build.partitions=default
+esp32s3camlcd.build.defines=-DBOARD_HAS_PSRAM
+esp32s3camlcd.build.memory_type=opi_opi
+esp32s3camlcd.build.loop_core=
+esp32s3camlcd.build.event_core=
+
+esp32s3camlcd.menu.LoopCore.1=Core 1
+esp32s3camlcd.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+esp32s3camlcd.menu.LoopCore.0=Core 0
+esp32s3camlcd.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+esp32s3camlcd.menu.EventsCore.1=Core 1
+esp32s3camlcd.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+esp32s3camlcd.menu.EventsCore.0=Core 0
+esp32s3camlcd.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+esp32s3camlcd.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+esp32s3camlcd.menu.PartitionScheme.default.build.partitions=default
+esp32s3camlcd.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+esp32s3camlcd.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+esp32s3camlcd.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+esp32s3camlcd.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+esp32s3camlcd.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+esp32s3camlcd.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+esp32s3camlcd.menu.PartitionScheme.minimal.build.partitions=minimal
+esp32s3camlcd.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+esp32s3camlcd.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32s3camlcd.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32s3camlcd.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+esp32s3camlcd.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+esp32s3camlcd.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+esp32s3camlcd.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+esp32s3camlcd.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+esp32s3camlcd.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+esp32s3camlcd.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+esp32s3camlcd.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+esp32s3camlcd.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+esp32s3camlcd.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+esp32s3camlcd.menu.PartitionScheme.huge_app.build.partitions=huge_app
+esp32s3camlcd.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+esp32s3camlcd.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+esp32s3camlcd.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32s3camlcd.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+esp32s3camlcd.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+esp32s3camlcd.menu.PartitionScheme.fatflash.build.partitions=ffat
+esp32s3camlcd.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+esp32s3camlcd.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+esp32s3camlcd.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+esp32s3camlcd.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+
+esp32s3camlcd.menu.UploadSpeed.921600=921600
+esp32s3camlcd.menu.UploadSpeed.921600.upload.speed=921600
+esp32s3camlcd.menu.UploadSpeed.115200=115200
+esp32s3camlcd.menu.UploadSpeed.115200.upload.speed=115200
+esp32s3camlcd.menu.UploadSpeed.256000.windows=256000
+esp32s3camlcd.menu.UploadSpeed.256000.upload.speed=256000
+esp32s3camlcd.menu.UploadSpeed.230400.windows.upload.speed=256000
+esp32s3camlcd.menu.UploadSpeed.230400=230400
+esp32s3camlcd.menu.UploadSpeed.230400.upload.speed=230400
+esp32s3camlcd.menu.UploadSpeed.460800.linux=460800
+esp32s3camlcd.menu.UploadSpeed.460800.macosx=460800
+esp32s3camlcd.menu.UploadSpeed.460800.upload.speed=460800
+esp32s3camlcd.menu.UploadSpeed.512000.windows=512000
+esp32s3camlcd.menu.UploadSpeed.512000.upload.speed=512000
+
+esp32s3camlcd.menu.DebugLevel.none=None
+esp32s3camlcd.menu.DebugLevel.none.build.code_debug=0
+esp32s3camlcd.menu.DebugLevel.error=Error
+esp32s3camlcd.menu.DebugLevel.error.build.code_debug=1
+esp32s3camlcd.menu.DebugLevel.warn=Warn
+esp32s3camlcd.menu.DebugLevel.warn.build.code_debug=2
+esp32s3camlcd.menu.DebugLevel.info=Info
+esp32s3camlcd.menu.DebugLevel.info.build.code_debug=3
+esp32s3camlcd.menu.DebugLevel.debug=Debug
+esp32s3camlcd.menu.DebugLevel.debug.build.code_debug=4
+esp32s3camlcd.menu.DebugLevel.verbose=Verbose
+esp32s3camlcd.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 esp32s2usb.name=ESP32S2 Native USB
 esp32s2usb.vid.0=0x303a
 esp32s2usb.pid.0=0x0003

platform.txt

@@ -117,6 +117,7 @@ compiler.elf2hex.extra_flags=
 compiler.libraries.ldflags=
 
 # This can be overriden in boards.txt
+build.memory_type=qspi_qspi
 build.flash_size=4MB
 build.flash_mode=dio
 build.boot=qio
@@ -165,7 +166,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.fla
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-Wl,--Map={build.path}/{build.project_name}.map" "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} -Wl,--start-group {object_files} "{archive_file_path}" {build.extra_libs} {compiler.c.elf.libs} {compiler.libraries.ldflags} -Wl,--end-group -Wl,-EL -o "{build.path}/{build.project_name}.elf"
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-Wl,--Map={build.path}/{build.project_name}.map" "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" "-L{compiler.sdk.path}/{build.memory_type}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {build.extra_flags} -Wl,--start-group {object_files} "{archive_file_path}" {build.extra_libs} {compiler.c.elf.libs} {compiler.libraries.ldflags} -Wl,--end-group -Wl,-EL -o "{build.path}/{build.project_name}.elf"
 
 ## Create partitions.bin
 recipe.objcopy.partitions.bin.pattern={tools.gen_esp32part.cmd} -q "{build.path}/partitions.csv" "{build.path}/{build.project_name}.partitions.bin"

tools/platformio-build-esp32.py

@@ -290,7 +290,8 @@
 
     LIBPATH=[
         join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "lib"),
-        join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "ld")
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "ld"),
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "qspi_qspi")
     ],
 
     LIBS=[

tools/platformio-build-esp32c3.py

@@ -280,7 +280,8 @@
 
     LIBPATH=[
         join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "lib"),
-        join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "ld")
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "ld"),
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "qspi_qspi")
     ],
 
     LIBS=[

tools/platformio-build-esp32s2.py

@@ -277,7 +277,8 @@
 
     LIBPATH=[
         join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "lib"),
-        join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "ld")
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "ld"),
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "qspi_qspi")
     ],
 
     LIBS=[

tools/platformio-build-esp32s3.py

@@ -294,7 +294,8 @@
 
     LIBPATH=[
         join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "lib"),
-        join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "ld")
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "ld"),
+        join(FRAMEWORK_DIR, "tools", "sdk", "esp32s3", "qspi_qspi")
     ],
 
     LIBS=[