Make S3 120 speed setting working (#125)

Author: Jason2866

.github/workflows/parallel_build.yaml

@@ -1,4 +1,4 @@
-name: IDF v5.5 based build
+name: IDF v5.5 S3 120M
 
 on:
   workflow_dispatch:  # Manually start a workflow

build.sh

@@ -211,11 +211,17 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
 
     # Build IDF Libs
     idf_libs_configs="$main_configs"
+    
+    # Extract frequency from idf_libs (element [1]) for esp32s3
+    if [ "$target" = "esp32s3" ]; then
+        export MEM_VARIANT_FREQ=$(echo "$target_json" | jq -r '.idf_libs[1]')
+    fi
+    
     for defconf in `echo "$target_json" | jq -c '.idf_libs[]' | tr -d '"'`; do
         idf_libs_configs="$idf_libs_configs;configs/defconfig.$defconf"
     done
 
-    echo "* Build IDF-Libs: $idf_libs_configs"
+    echo "* Build IDF-Libs: $idf_libs_configs (freq: $MEM_VARIANT_FREQ)"
     rm -rf build sdkconfig
     idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
     if [ $? -ne 0 ]; then exit 1; fi
@@ -236,11 +242,15 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
     # Build Memory Variants
     for mem_conf in `echo "$target_json" | jq -c '.mem_variants[]'`; do
         mem_configs="$main_configs"
+        
+        # Extract frequency from mem_variant (element [1])
+        export MEM_VARIANT_FREQ=$(echo "$mem_conf" | jq -r '.[1]')
+        
         for defconf in `echo "$mem_conf" | jq -c '.[]' | tr -d '"'`; do
             mem_configs="$mem_configs;configs/defconfig.$defconf";
         done
 
-        echo "* Build Memory Variant: $mem_configs"
+        echo "* Build Memory Variant: $mem_configs (freq: $MEM_VARIANT_FREQ)"
         rm -rf build sdkconfig
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem-variant
         if [ $? -ne 0 ]; then exit 1; fi

configs/builds.json

@@ -168,15 +168,16 @@
 			"idf_libs":["qio","80m","qio_ram"],
 			"bootloaders":[
 				["qio","120m","qio_ram"],
+				["opi","120m","opi_ram"],
 				["qio","80m","qio_ram"],
-				["dio","80m","qio_ram"],
 				["opi","80m","opi_ram"]
 			],
 			"mem_variants":[
+				["opi","80m","opi_ram"],
 				["qio","80m","opi_ram"],
-				["dio","80m","qio_ram"],
-				["dio","80m","opi_ram"],
-				["opi","80m","opi_ram"]
+				["qio","120m","opi_ram"],
+				["opi","120m","opi_ram"],
+				["qio","120m","qio_ram"]
 			]
 		}
 	]

configs/defconfig.120m

@@ -2,5 +2,6 @@ CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
 CONFIG_SPIRAM_SPEED_120M=y
 CONFIG_SPIRAM_SPEED=120
-# CONFIG_SPI_FLASH_HPM_ENA=y
+CONFIG_SPI_FLASH_HPM_ENABLE=y
+CONFIG_SPI_FLASH_HPM_AUTO=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y

tools/copy-libs.sh

@@ -13,6 +13,11 @@ else
 fi
 MEMCONF=$OCT_FLASH"_$OCT_PSRAM"
 
+# For esp32s3, add frequency from environment variable set by build.sh
+if [ "$IDF_TARGET" = "esp32s3" ] && [ -n "$MEM_VARIANT_FREQ" ]; then
+	MEMCONF=$MEMCONF"_$MEM_VARIANT_FREQ"
+fi
+
 source ./tools/config.sh
 
 echo "IDF_TARGET: $IDF_TARGET, MEMCONF: $MEMCONF, PWD: $PWD, OUT: $AR_SDK"
@@ -463,7 +468,7 @@ for item; do
 		fi
 	fi
 done
-echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")), \"include\")," >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, (board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")) + (\"_\" + board_config.get(\"build.f_boot\", board_config.get(\"build.f_flash\", \"80000000L\")).replace(\"000000L\", \"m\") if board_config.get(\"build.mcu\") == \"esp32s3\" else \"\")), \"include\")," >> "$AR_PLATFORMIO_PY"
 echo "        join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
@@ -488,7 +493,7 @@ done
 echo "    LIBPATH=[" >> "$AR_PLATFORMIO_PY"
 echo "        join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
 echo "        join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
-echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")))" >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, (board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")) + (\"_\" + board_config.get(\"build.f_boot\", board_config.get(\"build.f_flash\", \"80000000L\")).replace(\"000000L\", \"m\") if board_config.get(\"build.mcu\") == \"esp32s3\" else \"\")))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 

tools/copy-mem-variant.sh

@@ -11,6 +11,11 @@ fi
 
 MEMCONF=$OCT_FLASH"_$OCT_PSRAM"
 
+# For esp32s3, add frequency from environment variable set by build.sh
+if [ "$IDF_TARGET" = "esp32s3" ] && [ -n "$MEM_VARIANT_FREQ" ]; then
+	MEMCONF=$MEMCONF"_$MEM_VARIANT_FREQ"
+fi
+
 source ./tools/config.sh
 
 echo "IDF_TARGET: $IDF_TARGET, MEMCONF: $MEMCONF"