Skip to content

Commit d1358be

Browse files
committed
moves the copying of updated files to the very first thing that gets done.
This allows the modified files to be used in the collection of submodules needed for the build.
1 parent 187235d commit d1358be

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

builder/esp32.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,8 @@ def esp32_args(extra_args):
557557
def parse_args(extra_args, lv_cflags, brd):
558558
global board
559559

560+
copy_micropy_updates('esp32')
561+
560562
if brd is None:
561563
brd = 'ESP32_GENERIC'
562564

@@ -1483,8 +1485,6 @@ def compile(*args): # NOQA
14831485
update_mpconfigport()
14841486
update_mkrules()
14851487

1486-
copy_micropy_updates('esp32')
1487-
14881488
try:
14891489
cmd_ = compile_cmd[:]
14901490
cmd_.extend(args)
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
dependencies:
2+
espressif/mdns: "~1.1.0"
3+
espressif/tinyusb:
4+
rules:
5+
- if: "target in [esp32s2, esp32s3, esp32p4]"
6+
# Temporary workaround for https://github.com/hathach/tinyusb/issues/3154
7+
# Can be removed once fix is released in espressif/tinyusb
8+
git: https://github.com/micropython/tinyusb-espressif.git
9+
version: cherrypick/dwc2_zlp_fix
10+
espressif/esp_hosted:
11+
rules:
12+
- if: "target == esp32p4"
13+
version: "2.2.4"
14+
espressif/esp_wifi_remote:
15+
rules:
16+
- if: "target == esp32p4"
17+
version: "0.15.2"
18+
espressif/lan867x:
19+
version: "~1.0.0"
20+
rules:
21+
- if: "target == esp32"
22+
- if: "idf_version >=5.3"
23+
idf:
24+
version: ">=5.2.0"

0 commit comments

Comments
 (0)