MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to IDF v4.4.3. 

Rewrote the embed_lfs.sh section addr/size handling since it was still having
issues between compiler versions.
This commit is contained in:
Johny Mattsson 2022-11-10 17:03:07 +11:00 committed by Johny Mattsson
parent 1d173c818b
commit 4379dd9d31
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/esp32-esp-idf

@ -1 +1 @@
Subproject commit 1b16ef6cfc2479a08136782f9dc57effefa86f66 Subproject commit 6407ecb3f8d2cc07c4c230e7e64f2046af5c86f7

26
tools/embed_lfs.sh
View File

@ -15,28 +15,16 @@ if [ ! -f "${LUAC_CROSS}" ]; then
exit 1 exit 1
fi fi
# Extract the line containing the data size of the LFS object, filtering out # Extract the start/end symbols of the LFS object, then calculate the
# lines for .bss/.data/.text, sorting the remaining two entries (actual LFS # available size from that.
# data and (optional) riscv attributes) so we can discard the latter if LFS_ADDR=$(grep -E '0x[0-9a-f]+ +_binary_lua_flash_store_reserved_start' "${MAP_FILE}" | awk '{print $1}')
# present. If the map file was a bit saner with its line breaks this would LFS_ADDR_END=$(grep -E '0x[0-9a-f]+ +_binary_lua_flash_store_reserved_end' "${MAP_FILE}" | awk '{print $1}')
# have been a straight forward grep for for .rodata.embedded.*lua.flash.store if [ "${LFS_ADDR}" = "" ]
LFS_SIZE_ADDR=$(grep -E "0x[0-9a-f]+[ ]+0x[0-9a-f]+[ ]+esp-idf/embedded_lfs/libembedded_lfs.a\(lua.flash.store.reserved.S.obj\)" "${MAP_FILE}" | grep -v '^ \.' | awk '{print $2,$1}' | sort -n -k 1.3 | tail -1) then
if [ -z "${LFS_SIZE_ADDR}" ]; then
echo "Error: LFS segment not found. Use 'make clean; make' perhaps?"
exit 1
fi
LFS_ADDR=$(echo "${LFS_SIZE_ADDR}" | cut -d ' ' -f 2)
if [ -z "${LFS_ADDR}" ]; then
echo "Error: LFS segment address not found" echo "Error: LFS segment address not found"
exit 1 exit 1
fi fi
# The reported size is +4 due to the length field added by the IDF LFS_SIZE=$((LFS_ADDR_END - LFS_ADDR))
LFS_SIZE=$(( $(echo "${LFS_SIZE_ADDR}" | cut -d ' ' -f 1) - 4 ))
if [ -z "${LFS_SIZE}" ]; then
echo "Error: LFS segment size not found"
exit 1
fi
printf "LFS segment address %s, length %s (0x%x)\n" "${LFS_ADDR}" "${LFS_SIZE}" "${LFS_SIZE}" printf "LFS segment address %s, length %s (0x%x)\n" "${LFS_ADDR}" "${LFS_SIZE}" "${LFS_SIZE}"