Skip to content

Commit 8b29e07

Browse files
committed
make.py: allow using custom boards without .toml (classic MicroPython workflow)
builder/esp32: fix frozen manifest generation for external MCU-specific drivers (e.g. st7796, ft6x36, etc.) and *_api_gen_mpy.py files. .gitignore: update to exclude generated files and external libraries
1 parent 58113f2 commit 8b29e07

File tree

7 files changed

+103
-3396
lines changed

7 files changed

+103
-3396
lines changed

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,21 @@ __pycache__/
66
# C extensions
77
*.so
88

9+
# generated files
10+
gen/api_gen/templates/module.c
11+
gen/api_gen/templates/module/decl.c
12+
gen/api_gen/templates/module/helpers.c
13+
ext_mod/lvgl/lextab.py
14+
ext_mod/lvgl/yacctab.py
15+
lvgl.pyi
16+
917
# Distribution / packaging
18+
lib/micropython
19+
lib/esp-idf
20+
lib/lvgl
21+
lib/pycparser
22+
lib/SDL
23+
1024
.Python
1125
build/
1226
develop-eggs/

builder/esp32.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,8 +1339,6 @@ def update_main():
13391339

13401340

13411341
def build_sdkconfig(*args):
1342-
if custom_board_path is not None:
1343-
return []
13441342

13451343
base_config = [
13461344
'',
@@ -1411,10 +1409,13 @@ def build_sdkconfig(*args):
14111409
base_config.append(
14121410
f'CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_{itm}=n'
14131411
)
1414-
1412+
14151413
base_config.append(arg)
14161414
args.remove(arg)
14171415

1416+
elif arg.startswith("--"):
1417+
args.remove(arg)
1418+
14181419
base_config.append(f'CONFIG_ESPTOOLPY_FLASHSIZE_{flash_size}MB=y')
14191420
base_config.append(''.join([
14201421
'CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=',

0 commit comments

Comments
 (0)