fix: use var MEM_VARIANT_FREQ

Author: Jason2866

build.sh

@@ -236,11 +236,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

tools/copy-libs.sh

@@ -4,7 +4,6 @@
 IDF_TARGET=$1
 IS_XTENSA=$4
 OCT_FLASH="$2"
-MEM_FREQ="$5"
 OCT_PSRAM=
 
 if [ "$3" = "y" ]; then
@@ -13,8 +12,10 @@ else
 	OCT_PSRAM="qspi"
 fi
 MEMCONF=$OCT_FLASH"_$OCT_PSRAM"
-if [ "$IDF_TARGET" = "esp32s3" ] && [ -n "$MEM_FREQ" ]; then
-	MEMCONF=$MEMCONF"_$MEM_FREQ"
+
+# 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

tools/copy-mem-variant.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 IDF_TARGET=$1
 OCT_FLASH="$2"
-MEM_FREQ="$4"
 OCT_PSRAM=
 
 if [ "$3" = "y" ]; then
@@ -11,8 +10,10 @@ else
 fi
 
 MEMCONF=$OCT_FLASH"_$OCT_PSRAM"
-if [ "$IDF_TARGET" = "esp32s3" ] && [ -n "$MEM_FREQ" ]; then
-	MEMCONF=$MEMCONF"_$MEM_FREQ"
+
+# 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