Skip to content

Commit 57b7905

Browse files
committed
add freq to mem variant folder
1 parent c394de7 commit 57b7905

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tools/copy-libs.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
IDF_TARGET=$1
55
IS_XTENSA=$4
66
OCT_FLASH="$2"
7+
MEM_FREQ="$5"
78
OCT_PSRAM=
89

910
if [ "$3" = "y" ]; then
@@ -12,6 +13,9 @@ else
1213
OCT_PSRAM="qspi"
1314
fi
1415
MEMCONF=$OCT_FLASH"_$OCT_PSRAM"
16+
if [ -n "$MEM_FREQ" ]; then
17+
MEMCONF=$MEMCONF"_$MEM_FREQ"
18+
fi
1519

1620
source ./tools/config.sh
1721

@@ -463,7 +467,7 @@ for item; do
463467
fi
464468
fi
465469
done
466-
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")), \"include\")," >> "$AR_PLATFORMIO_PY"
470+
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi_\" + board_config.get(\"f_boot\", board_config.get(\"f_flash\", \"80000000L\")).rstrip(\"000000L\") + \"m\")), \"include\")," >> "$AR_PLATFORMIO_PY"
467471
echo " join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
468472
echo " ]," >> "$AR_PLATFORMIO_PY"
469473
echo "" >> "$AR_PLATFORMIO_PY"
@@ -488,7 +492,7 @@ done
488492
echo " LIBPATH=[" >> "$AR_PLATFORMIO_PY"
489493
echo " join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
490494
echo " join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
491-
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")))" >> "$AR_PLATFORMIO_PY"
495+
echo " join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi_\" + board_config.get(\"f_boot\", board_config.get(\"f_flash\", \"80000000L\")).rstrip(\"000000L\") + \"m\")))" >> "$AR_PLATFORMIO_PY"
492496
echo " ]," >> "$AR_PLATFORMIO_PY"
493497
echo "" >> "$AR_PLATFORMIO_PY"
494498

tools/copy-mem-variant.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
IDF_TARGET=$1
33
OCT_FLASH="$2"
4+
MEM_FREQ="$4"
45
OCT_PSRAM=
56

67
if [ "$3" = "y" ]; then
@@ -10,6 +11,9 @@ else
1011
fi
1112

1213
MEMCONF=$OCT_FLASH"_$OCT_PSRAM"
14+
if [ -n "$MEM_FREQ" ]; then
15+
MEMCONF=$MEMCONF"_$MEM_FREQ"
16+
fi
1317

1418
source ./tools/config.sh
1519

0 commit comments

Comments
 (0)