Skip to content

Commit 05efb83

Browse files
AdrianSoundyAdrianSoundy
committed
Update to IDF 5.4.2
1 parent ad20f01 commit 05efb83

File tree

8 files changed

+202
-47
lines changed

8 files changed

+202
-47
lines changed

‎.devcontainer/All/Dockerfile.All.SRC

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-
9393
RUN git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
9494

9595
# Clone ESP-IDF
96-
RUN git clone --branch v5.4.1 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
96+
RUN git clone --branch v5.4.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
9797

9898
# Clone what is needed for TI
9999
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \

‎.devcontainer/ESP32/Dockerfile.ESP32.SRC

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN mkdir -p /usr/local/bin/gcc
4949
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
5050

5151
# Clone ESP-IDF
52-
RUN git clone --branch v5.4.1 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
52+
RUN git clone --branch v5.4.2 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
5353

5454
# Creating static link python for pyhton3
5555
RUN ln -fs /usr/bin/python3 /usr/bin/python \

‎.vscode/tasks.TEMPLATE.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,17 @@
2828
{
2929
"label": "Flash nanoCLR to ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S3",
3030
"type": "shell",
31-
"command": "python ${env:IDF_PATH}/components/esptool_py/esptool/esptool.py --chip auto --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" write_flash -z --flash_size detect 0x0 ${workspaceFolder}/build/bootloader/bootloader.bin 0x10000 ${workspaceFolder}/build/nanoCLR.bin 0x8000 ${workspaceFolder}/build/partitions_${input:esp32Partitions}.bin",
31+
"command": "python ${env:IDF_PATH}/components/esptool_py/esptool/esptool.py --chip auto --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" write_flash -z --flash_size detect 0x0 ${workspaceFolder}/build/bootloader/bootloader.bin 0x10000 ${workspaceFolder}/build/nanoCLR.bin 0x8000 ${workspaceFolder}/build/partitions_${input:esp32Partitions}.bin --force",
32+
"presentation": {
33+
"reveal": "always",
34+
"panel": "shared"
35+
},
36+
"problemMatcher": []
37+
},
38+
{
39+
"label": "Flash nanoCLR to ESP32-P4",
40+
"type": "shell",
41+
"command": "python ${env:IDF_PATH}/components/esptool_py/esptool/esptool.py --chip auto --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" write_flash -z --flash_size detect 0x2000 ${workspaceFolder}/build/bootloader/bootloader.bin 0x10000 ${workspaceFolder}/build/nanoCLR.bin 0x8000 ${workspaceFolder}/build/partitions_${input:esp32Partitions}.bin",
3242
"presentation": {
3343
"reveal": "always",
3444
"panel": "shared"

‎.vscode/tasks.TEMPLATE.json.bak

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Install nanoFramework tools",
6+
"type": "shell",
7+
"group": "none",
8+
"presentation": {
9+
"echo": true,
10+
"reveal": "always",
11+
"focus": false,
12+
"panel": "shared",
13+
"showReuseMessage": true,
14+
"clear": false
15+
},
16+
"command": "install-scripts\\install-nf-tools.ps1 -TargetSeries ${input:targetSeries} -Path '${input:toolsPath}' "
17+
},
18+
{
19+
"label": "Flash nanoCLR to ESP32 | ESP32-S2",
20+
"type": "shell",
21+
"command": "python ${env:IDF_PATH}/components/esptool_py/esptool/esptool.py --chip auto --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" write_flash -z --flash_size detect 0x1000 ${workspaceFolder}/build/bootloader/bootloader.bin 0x10000 ${workspaceFolder}/build/nanoCLR.bin 0x8000 ${workspaceFolder}/build/partitions_${input:esp32Partitions}.bin",
22+
"presentation": {
23+
"reveal": "always",
24+
"panel": "shared"
25+
},
26+
"problemMatcher": []
27+
},
28+
{
29+
"label": "Flash nanoCLR to ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S3",
30+
"type": "shell",
31+
"command": "python ${env:IDF_PATH}/components/esptool_py/esptool/esptool.py --chip auto --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" write_flash -z --flash_size detect 0x0 ${workspaceFolder}/build/bootloader/bootloader.bin 0x10000 ${workspaceFolder}/build/nanoCLR.bin 0x8000 ${workspaceFolder}/build/partitions_${input:esp32Partitions}.bin",
32+
"presentation": {
33+
"reveal": "always",
34+
"panel": "shared"
35+
},
36+
"problemMatcher": []
37+
},
38+
{
39+
"label": "Erase ESP32 flash",
40+
"type": "shell",
41+
"command": "python ${env:IDF_PATH}/components/esptool_py/esptool/esptool.py --chip auto --port \"${input:comPort}\" --baud 1500000 --before \"default_reset\" --after \"hard_reset\" erase_flash",
42+
"presentation": {
43+
"reveal": "always",
44+
"panel": "shared"
45+
},
46+
"problemMatcher": []
47+
},
48+
{
49+
"label": "Decode ESP32 backtrace",
50+
"type": "shell",
51+
"command": "xtensa-${input:esp32series}-elf-addr2line -apsfCire \"${input:espBacktraceElfFile}\" \"${input:espBacktrace}\"",
52+
"presentation": {
53+
"reveal": "always",
54+
"panel": "shared"
55+
},
56+
"problemMatcher": []
57+
},
58+
{
59+
"label": "Decode ESP32 (riscv32 series) backtrace",
60+
"type": "shell",
61+
"command": "riscv32-esp-elf-addr2line -apsfCire \"${input:espBacktraceElfFile}\" \"${input:espBacktrace}\"",
62+
"presentation": {
63+
"reveal": "always",
64+
"panel": "shared"
65+
},
66+
"problemMatcher": []
67+
},
68+
{
69+
"label": "Flash MIMXRT1060",
70+
"type": "shell",
71+
"command": "C:/nxp/MCUXpressoIDE_10.2.1_795/ide/bin/crt_emu_cm_redlink.exe",
72+
"options": {
73+
"cwd": "${workspaceFolder}/Build"
74+
},
75+
"args": [
76+
"-pMIMXRT1062xxxxA",
77+
"--vendor=NXP",
78+
"--flash-dir=C:/nxp/MCUXpressoIDE_10.2.1_795/ide/bin/Flash",
79+
"--flash-driver=MIMXRT1060_SFDP_QSPI.cfx",
80+
"--flash-load=nanoBooter.elf",
81+
"--rst"
82+
],
83+
"presentation": {
84+
"reveal": "always",
85+
"panel": "dedicated"
86+
},
87+
"problemMatcher": []
88+
},
89+
{
90+
"label": "Erase flash Silabs GG11",
91+
"type": "shell",
92+
"command": "${env:JLINK_PATH}/Jlink.exe -device default -si swd -CommandFile ${workspaceRoot}/.jlink/erase_gg11.jlink",
93+
"windows": {
94+
"options": {
95+
"shell": {
96+
"executable": "cmd.exe",
97+
"args": [
98+
"/c"
99+
]
100+
}
101+
}
102+
},
103+
"problemMatcher": []
104+
},
105+
{
106+
"label": "Flash Silabs GG11",
107+
"type": "shell",
108+
"command": "${env:JLINK_PATH}/Jlink.exe -device default -si swd -CommandFile ${workspaceRoot}/.jlink/flash_gg11.jlink",
109+
"windows": {
110+
"options": {
111+
"shell": {
112+
"executable": "cmd.exe",
113+
"args": [
114+
"/c"
115+
]
116+
},
117+
"cwd": "${workspaceFolder}/Build"
118+
}
119+
},
120+
"problemMatcher": []
121+
}
122+
],
123+
"inputs": [
124+
{
125+
"id": "toolsPath",
126+
"type": "promptString",
127+
"default": "C:\nftools",
128+
"description": "Path where to install the tools."
129+
},
130+
{
131+
"id": "targetSeries",
132+
"type": "pickString",
133+
"description": "Series of the target to install the tools for.",
134+
"options": [
135+
"ESP32",
136+
"STM32",
137+
"NXP",
138+
"TI"
139+
]
140+
},
141+
{
142+
"id": "comPort",
143+
"type": "promptString",
144+
"default": "COM1",
145+
"description": "COM port of the ESP32 device."
146+
},
147+
{
148+
"id": "esp32Partitions",
149+
"type": "pickString",
150+
"description": "Partition to flash to ESP32.",
151+
"default": "4mb",
152+
"options": [
153+
"2mb",
154+
"4mb",
155+
"8mb",
156+
"16mb",
157+
"32mb"
158+
]
159+
},
160+
{
161+
"id": "esp32series",
162+
"type": "pickString",
163+
"description": "ESP32 series",
164+
"default": "esp32",
165+
"options": [
166+
"esp32",
167+
"esp32s2",
168+
"esp32s3"
169+
]
170+
},
171+
{
172+
"id": "espBacktrace",
173+
"type": "promptString",
174+
"default": "",
175+
"description": "Backtrace information from 'Guru Meditation Error' output. *** JUST THE BACKTRACE line, NOT the whole output! ***"
176+
},
177+
{
178+
"id": "espBacktraceElfFile",
179+
"type": "promptString",
180+
"default": "${workspaceFolder}/build/nanoCLR.elf",
181+
"description": "Path to ELF file. Default is the current build executable."
182+
}
183+
]
184+
}

‎CMake/binutils.ESP32.cmake

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -151,42 +151,6 @@ macro(nf_fix_esp32c3_rom_file)
151151

152152
endmacro()
153153

154-
# Fixes an issue with IDF 5.4.1 where we get an error cause by ESP_ROM_ELF_DIR environment variable missing
155-
# This patch removes need for variable. Offical patch added after IDF5.4.1 release
156-
macro(nf_patch_idf5_4_1)
157-
file(READ
158-
${esp32_idf_SOURCE_DIR}/tools/cmake/gdbinit.cmake
159-
ESP32_GBBINIT_CONTENT)
160-
161-
string(FIND ${ESP32_GBBINIT_CONTENT} "# set(gdbinit_rom_in_path " GBD_INIT_PATCH_INDEX)
162-
message("-- Check IDF patch exists")
163-
if(GBD_INIT_PATCH_INDEX EQUAL -1)
164-
165-
message("-- Patching IDF 5.4.1 gdbinit.cmake")
166-
167-
string(REPLACE
168-
"set(gdbinit_rom_in_path "
169-
"# set(gdbinit_rom_in_path "
170-
ESP32_GBBINIT_NEW_CONTENT
171-
"${ESP32_GBBINIT_CONTENT}")
172-
173-
string(REPLACE
174-
"set(gdbinit_rom_path "
175-
"# set(gdbinit_rom_path "
176-
ESP32_GBBINIT_NEW_CONTENT
177-
"${ESP32_GBBINIT_NEW_CONTENT}")
178-
179-
string(REPLACE
180-
"file(TO_CMAKE_PATH "
181-
"# file(TO_CMAKE_PATH "
182-
ESP32_GBBINIT_NEW_CONTENT
183-
"${ESP32_GBBINIT_NEW_CONTENT}")
184-
185-
file(WRITE
186-
${esp32_idf_SOURCE_DIR}/tools/cmake/gdbinit.cmake
187-
"${ESP32_GBBINIT_NEW_CONTENT}")
188-
endif()
189-
endmacro()
190154

191155
# setting compile definitions for a target based on general build options
192156
# TARGET parameter to set the target that's setting them for
@@ -1061,9 +1025,6 @@ macro(nf_add_idf_as_library)
10611025

10621026
nf_fix_esp32c3_rom_file()
10631027

1064-
# FIXME patch IDF 5.4.1 problem
1065-
nf_patch_idf5_4_1()
1066-
10671028
# find out if there is support for BLE
10681029
string(FIND ${SDKCONFIG_DEFAULT_CONTENTS} "CONFIG_BT_ENABLED=y" CONFIG_BT_ENABLED_POS)
10691030

‎azure-pipelines-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ resources:
1717
type: github
1818
name: espressif/esp-idf
1919
endpoint: nanoframework
20-
ref: refs/tags/v5.4.1
20+
ref: refs/tags/v5.4.2
2121

2222
# scheduled build
2323
# the schedule is defined at the AZDO web interface because of inconsistencies with time zones
@@ -611,7 +611,7 @@ jobs:
611611
IDF_PATH: "D:/a/1/s/esp-idf"
612612
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
613613
TargetPlatform: "esp32"
614-
IDF_TAG: "v5.4.1"
614+
IDF_TAG: "v5.4.2"
615615

616616
steps:
617617
- checkout: self

‎azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resources:
4444
type: github
4545
name: espressif/esp-idf
4646
endpoint: nanoframework
47-
ref: refs/tags/v5.4.1
47+
ref: refs/tags/v5.4.2
4848
- repository: mscorlib
4949
type: github
5050
name: nanoframework/CoreLibrary
@@ -535,7 +535,7 @@ jobs:
535535
IDF_PATH: "D:/a/1/s/esp-idf"
536536
PIP_CACHE_DIR: $(Pipeline.Workspace)/.pip
537537
TargetPlatform: "esp32"
538-
IDF_TAG: "v5.4.1"
538+
IDF_TAG: "v5.4.2"
539539

540540
steps:
541541
- checkout: self

‎targets/ESP32/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ endif()
6464
# 3. cache tag in build and download AZDO yaml templates #
6565
#################################################################################
6666
#################################################################################
67-
set(ESP32_IDF_TAG "5.4.1" CACHE INTERNAL "ESP32 IDF tag")
67+
set(ESP32_IDF_TAG "5.4.2" CACHE INTERNAL "ESP32 IDF tag")
6868
#################################################################################
6969
#################################################################################
7070

0 commit comments

Comments
 (0)