Skip to content

Commit 2601670

Browse files
committed
Fix mem variant builds for chip variants
1 parent f049bf0 commit 2601670

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

configs/builds.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"file":"libspi_flash.a",
55
"src":"build/esp-idf/spi_flash/libspi_flash.a",
66
"out":"lib/libspi_flash.a",
7-
"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4","esp32c5"]
7+
"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4","esp32p4_es","esp32c5"]
88
},
99
{
1010
"file":"libesp_psram.a",

tools/copy-libs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ mv "$PWD/build/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
582582
for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
583583
skip_file=1
584584
for file_target in $(echo "$mem_variant" | jq -c '.targets[]' | tr -d '"'); do
585-
if [ "$file_target" == "$IDF_TARGET" ]; then
585+
if [ "$file_target" == "$CHIP_VARIANT" ]; then
586586
skip_file=0
587587
break
588588
fi

tools/copy-mem-variant.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mv "build/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
2727
for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
2828
skip_file=1
2929
for file_target in $(echo "$mem_variant" | jq -c '.targets[]' | tr -d '"'); do
30-
if [ "$file_target" == "$IDF_TARGET" ]; then
30+
if [ "$file_target" == "$CHIP_VARIANT" ]; then
3131
skip_file=0
3232
break
3333
fi

0 commit comments

Comments
 (0)