Skip to content

Commit 5527262

Browse files
authored
Merge pull request #746 from espressif/petr/fix/various_issues
Petr/fix/various issues
2 parents 4b3f542 + 687f3fb commit 5527262

File tree

2 files changed

+45
-62
lines changed

2 files changed

+45
-62
lines changed

.github/workflows/build-run-applications.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -189,22 +189,6 @@ jobs:
189189
benchmark_*.md
190190
benchmark_*.json
191191
benchmark.json
192-
- name: Check if benchmark files exist
193-
id: check_files
194-
run: |
195-
if ls benchmark_*.json benchmark_*.md 2>/dev/null; then
196-
echo "benchmark_files_exist=true" >> $GITHUB_ENV
197-
else
198-
echo "benchmark_files_exist=false" >> $GITHUB_ENV
199-
fi
200-
- name: Upload test results
201-
uses: actions/upload-artifact@v4
202-
if: github.ref_name == 'master' && env.benchmark_files_exist == 'true'
203-
with:
204-
name: ${{ env.BENCHMARK_RESULT_NAME }}
205-
path: |
206-
benchmark_*.md
207-
benchmark_*.json
208192
- name: Update benchmark release
209193
uses: pyTooling/Actions/releaser@r0
210194
if: github.ref_name == 'master' && env.benchmark_files_exist == 'true'

components/bsp_selector/Kconfig

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,112 @@
11
menu "BSP Selector"
22

33
# Hidden variables to drive Conditional Dependencies
4-
4+
55
config ESP_BSP_DEVKIT
66
int
77
default 1 if BSP_SELECT_ESP_BSP_DEVKIT
88
default 0
9-
9+
1010
config ESP_BSP_GENERIC
1111
int
1212
default 1 if BSP_SELECT_ESP_BSP_GENERIC
1313
default 0
14-
14+
1515
config ESP_WROVER_KIT
1616
int
1717
default 1 if BSP_SELECT_ESP_WROVER_KIT
1818
default 0
19-
19+
2020
config ESP32_C3_LCDKIT
2121
int
2222
default 1 if BSP_SELECT_ESP32_C3_LCDKIT
2323
default 0
24-
24+
2525
config ESP32_LYRAT
2626
int
2727
default 1 if BSP_SELECT_ESP32_LYRAT
2828
default 0
29-
29+
3030
config ESP32_P4_EYE
3131
int
3232
default 1 if BSP_SELECT_ESP32_P4_EYE
3333
default 0
34-
34+
3535
config ESP32_P4_FUNCTION_EV_BOARD
3636
int
3737
default 1 if BSP_SELECT_ESP32_P4_FUNCTION_EV_BOARD
3838
default 0
39-
39+
4040
config ESP32_S3_EYE
4141
int
4242
default 1 if BSP_SELECT_ESP32_S3_EYE
4343
default 0
44-
44+
4545
config ESP32_S3_KORVO_1
4646
int
4747
default 1 if BSP_SELECT_ESP32_S3_KORVO_1
4848
default 0
49-
49+
5050
config ESP32_S3_KORVO_2
5151
int
5252
default 1 if BSP_SELECT_ESP32_S3_KORVO_2
5353
default 0
54-
54+
5555
config ESP32_S3_LCD_EV_BOARD
5656
int
5757
default 1 if BSP_SELECT_ESP32_S3_LCD_EV_BOARD
5858
default 0
59-
59+
6060
config ESP32_S3_USB_OTG
6161
int
6262
default 1 if BSP_SELECT_ESP32_S3_USB_OTG
6363
default 0
64-
64+
6565
config ESP_BOX_3
6666
int
6767
default 1 if BSP_SELECT_ESP_BOX_3
6868
default 0
69-
69+
7070
config M5_ATOM_S3
7171
int
7272
default 1 if BSP_SELECT_M5_ATOM_S3
7373
default 0
74-
74+
7575
config M5DIAL
7676
int
7777
default 1 if BSP_SELECT_M5DIAL
7878
default 0
79-
79+
8080
config M5STACK_CORE
8181
int
8282
default 1 if BSP_SELECT_M5STACK_CORE
8383
default 0
84-
84+
8585
config M5STACK_CORE_2
8686
int
8787
default 1 if BSP_SELECT_M5STACK_CORE_2
8888
default 0
89-
89+
9090
config M5STACK_CORE_S3
9191
int
9292
default 1 if BSP_SELECT_M5STACK_CORE_S3
9393
default 0
94-
94+
9595
config M5STACK_TAB5
9696
int
9797
default 1 if BSP_SELECT_M5STACK_TAB5
9898
default 0
99-
99+
100100
config ESP_VOCAT
101101
int
102102
default 1 if BSP_SELECT_ESP_VOCAT
103103
default 0
104-
104+
105105
config BSP_SELECT_GLIB_SEL
106106
int
107107
default 1 if BSP_SELECT_GLIB
108108
default 0
109-
109+
110110
config BSP_SELECT_GLIB
111111
bool "Use GLIB version (with LVGL)"
112112
default y
@@ -116,95 +116,94 @@ menu "BSP Selector"
116116
choice BSP_SELECT
117117
prompt "Select BSP"
118118
default BSP_SELECT_ESP_WROVER_KIT if IDF_TARGET_ESP32
119-
default BSP_SELECT_ESP32_S2_KALUGA_KIT if IDF_TARGET_ESP32S2
120119
default BSP_SELECT_ESP_BOX_3 if IDF_TARGET_ESP32S3
121120
default BSP_SELECT_ESP32_P4_FUNCTION_EV_BOARD if IDF_TARGET_ESP32P4
122121
default BSP_SELECT_ESP32_C3_LCDKIT if IDF_TARGET_ESP32C3
123122
help
124123
Select which BSP will be used in project.
125-
124+
126125
config BSP_SELECT_NONE
127126
bool "ESP_BSP_NONE"
128-
127+
129128
config BSP_SELECT_ESP_BSP_DEVKIT
130129
bool "ESP_BSP_DEVKIT"
131-
130+
132131
config BSP_SELECT_ESP_BSP_GENERIC
133132
depends on BSP_SELECT_GLIB
134133
bool "ESP_BSP_GENERIC"
135-
134+
136135
config BSP_SELECT_ESP_WROVER_KIT
137136
depends on IDF_TARGET_ESP32
138137
bool "ESP_WROVER_KIT"
139-
138+
140139
config BSP_SELECT_ESP32_C3_LCDKIT
141140
depends on IDF_TARGET_ESP32C3 && BSP_SELECT_GLIB
142141
bool "ESP32_C3_LCDKIT"
143-
142+
144143
config BSP_SELECT_ESP32_LYRAT
145144
depends on IDF_TARGET_ESP32 && BSP_SELECT_GLIB
146145
bool "ESP32_LYRAT"
147-
146+
148147
config BSP_SELECT_ESP32_P4_EYE
149148
depends on IDF_TARGET_ESP32P4
150149
bool "ESP32_P4_EYE"
151-
150+
152151
config BSP_SELECT_ESP32_P4_FUNCTION_EV_BOARD
153152
depends on IDF_TARGET_ESP32P4
154153
bool "ESP32_P4_FUNCTION_EV_BOARD"
155-
154+
156155
config BSP_SELECT_ESP32_S3_EYE
157156
depends on IDF_TARGET_ESP32S3
158157
bool "ESP32_S3_EYE"
159-
158+
160159
config BSP_SELECT_ESP32_S3_KORVO_1
161160
depends on IDF_TARGET_ESP32S3 && BSP_SELECT_GLIB
162161
bool "ESP32_S3_KORVO_1"
163-
162+
164163
config BSP_SELECT_ESP32_S3_KORVO_2
165164
depends on IDF_TARGET_ESP32S3
166165
bool "ESP32_S3_KORVO_2"
167-
166+
168167
config BSP_SELECT_ESP32_S3_LCD_EV_BOARD
169168
depends on IDF_TARGET_ESP32S3
170169
bool "ESP32_S3_LCD_EV_BOARD"
171-
170+
172171
config BSP_SELECT_ESP32_S3_USB_OTG
173172
depends on IDF_TARGET_ESP32S3 && BSP_SELECT_GLIB
174173
bool "ESP32_S3_USB_OTG"
175-
174+
176175
config BSP_SELECT_ESP_BOX_3
177176
depends on IDF_TARGET_ESP32S3
178177
bool "ESP_BOX_3"
179-
178+
180179
config BSP_SELECT_M5_ATOM_S3
181180
depends on IDF_TARGET_ESP32S3
182181
bool "M5_ATOM_S3"
183-
182+
184183
config BSP_SELECT_M5DIAL
185184
depends on IDF_TARGET_ESP32S3
186185
bool "M5DIAL"
187-
186+
188187
config BSP_SELECT_M5STACK_CORE
189188
depends on IDF_TARGET_ESP32
190189
bool "M5STACK_CORE"
191-
190+
192191
config BSP_SELECT_M5STACK_CORE_2
193192
depends on IDF_TARGET_ESP32
194193
bool "M5STACK_CORE_2"
195-
194+
196195
config BSP_SELECT_M5STACK_CORE_S3
197196
depends on IDF_TARGET_ESP32S3
198197
bool "M5STACK_CORE_S3"
199-
198+
200199
config BSP_SELECT_M5STACK_TAB5
201200
depends on IDF_TARGET_ESP32P4
202201
bool "M5STACK_TAB5"
203-
202+
204203
config BSP_SELECT_ESP_VOCAT
205204
depends on IDF_TARGET_ESP32S3
206205
bool "ESP_VOCAT"
207-
208-
endchoice
206+
207+
endchoice
209208

210209
endmenu

0 commit comments

Comments
 (0)