Skip to content

Commit 8dc5e7e

Browse files
authored
Update copy-libs.sh
1 parent 34d4c78 commit 8dc5e7e

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

tools/copy-libs.sh

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33

44
IDF_TARGET=$1
55
IS_XTENSA=$4
6-
OCT_FLASH=
6+
OCT_FLASH="$2"
77
OCT_PSRAM=
8-
if [ "$2" = "y" ]; then
9-
OCT_FLASH="opi"
10-
else
11-
OCT_FLASH="qspi"
12-
fi
8+
139
if [ "$3" = "y" ]; then
1410
OCT_PSRAM="opi"
1511
else
@@ -514,9 +510,18 @@ done
514510
mkdir -p "$AR_SDK/$MEMCONF/include"
515511
mv "$PWD/build/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
516512
for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
517-
file=$(echo "$mem_variant" | jq -c '.file' | tr -d '"')
518-
out=$(echo "$mem_variant" | jq -c '.out' | tr -d '"')
519-
mv "$AR_SDK/$out" "$AR_SDK/$MEMCONF/$file"
513+
skip_file=1
514+
for file_target in $(echo "$mem_variant" | jq -c '.targets[]' | tr -d '"'); do
515+
if [ "$file_target" == "$IDF_TARGET" ]; then
516+
skip_file=0
517+
break
518+
fi
519+
done
520+
if [ $skip_file -eq 0 ]; then
521+
file=$(echo "$mem_variant" | jq -c '.file' | tr -d '"')
522+
out=$(echo "$mem_variant" | jq -c '.out' | tr -d '"')
523+
mv "$AR_SDK/$out" "$AR_SDK/$MEMCONF/$file"
524+
fi
520525
done;
521526

522527
# Add IDF versions to sdkconfig

0 commit comments

Comments
 (0)