Add changes required for the new memory configs

Author: me-no-dev

boards.txt

@@ -65,9 +65,8 @@ esp32s3.build.partitions=default
 esp32s3.build.defines=
 esp32s3.build.loop_core=
 esp32s3.build.event_core=
-esp32s3.build.flash_type=qspi
 esp32s3.build.psram_type=qspi
-esp32s3.build.memory_type={build.flash_type}_{build.psram_type}
+esp32s3.build.memory_type={build.boot}_{build.psram_type}
 
 esp32s3.menu.PSRAM.disabled=Disabled
 esp32s3.menu.PSRAM.disabled.build.defines=
@@ -84,25 +83,21 @@ esp32s3.menu.FlashMode.qio.build.flash_mode=dio
 esp32s3.menu.FlashMode.qio.build.boot=qio
 esp32s3.menu.FlashMode.qio.build.boot_freq=80m
 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.boot_freq=120m
 esp32s3.menu.FlashMode.qio120.build.flash_freq=80m
-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.dio.build.boot_freq=80m
 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.FlashMode.opi.build.boot_freq=80m
 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

platform.txt

@@ -120,7 +120,6 @@ 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.flash_freq=80m
@@ -135,6 +134,7 @@ build.loop_core=
 build.event_core=
 build.extra_flags=-DESP32 -DCORE_DEBUG_LEVEL={build.code_debug} {build.loop_core} {build.event_core} {build.defines} {build.extra_flags.{build.mcu}}
 build.extra_libs=
+build.memory_type={build.boot}_qspi
 
 # Custom build options
 build.opt.name=build_opt.h