mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-01 18:50:34 +03:00
Merge branch 'fix/output_rewrite_v6.0' into 'release/v6.0'
Fix dependencies for flash targets (v6.0) See merge request espressif/esp-idf!43992
This commit is contained in:
@@ -641,7 +641,8 @@ def action_extensions(base_actions: dict, project_path: str) -> dict:
|
||||
'callback': flash,
|
||||
'help': 'Flash the project.',
|
||||
'options': global_options + flash_options,
|
||||
'order_dependencies': ['all', 'erase-flash'],
|
||||
'order_dependencies': ['erase-flash'],
|
||||
'dependencies': ['all'],
|
||||
},
|
||||
'erase-flash': {
|
||||
'callback': erase_flash,
|
||||
@@ -1178,31 +1179,36 @@ def action_extensions(base_actions: dict, project_path: str) -> dict:
|
||||
'callback': flash,
|
||||
'help': 'Flash partition table only.',
|
||||
'options': flash_options,
|
||||
'order_dependencies': ['partition-table', 'erase-flash'],
|
||||
'order_dependencies': ['erase-flash'],
|
||||
'dependencies': ['partition-table'],
|
||||
},
|
||||
'bootloader-flash': {
|
||||
'callback': flash,
|
||||
'help': 'Flash bootloader only.',
|
||||
'options': flash_options,
|
||||
'order_dependencies': ['bootloader', 'erase-flash'],
|
||||
'order_dependencies': ['erase-flash'],
|
||||
'dependencies': ['bootloader'],
|
||||
},
|
||||
'app-flash': {
|
||||
'callback': flash,
|
||||
'help': 'Flash the app only.',
|
||||
'options': flash_options,
|
||||
'order_dependencies': ['app', 'erase-flash'],
|
||||
'order_dependencies': ['erase-flash'],
|
||||
'dependencies': ['app'],
|
||||
},
|
||||
'encrypted-app-flash': {
|
||||
'callback': flash,
|
||||
'help': 'Flash the encrypted app only.',
|
||||
'options': flash_options,
|
||||
'order_dependencies': ['app', 'erase-flash'],
|
||||
'order_dependencies': ['erase-flash'],
|
||||
'dependencies': ['app'],
|
||||
},
|
||||
'encrypted-flash': {
|
||||
'callback': flash,
|
||||
'help': 'Flash the encrypted project.',
|
||||
'options': flash_options,
|
||||
'order_dependencies': ['all', 'erase-flash'],
|
||||
'order_dependencies': ['erase-flash'],
|
||||
'dependencies': ['all'],
|
||||
},
|
||||
'erase-otadata': {
|
||||
'callback': ota_targets,
|
||||
|
||||
Reference in New Issue
Block a user