-
Notifications
You must be signed in to change notification settings - Fork 89
Add classic custom-board support and fix ESP32 build issues #508
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1339,8 +1339,6 @@ def update_main(): | |
|
|
||
|
|
||
| def build_sdkconfig(*args): | ||
| if custom_board_path is not None: | ||
| return [] | ||
|
|
||
| base_config = [ | ||
| '', | ||
|
|
@@ -1411,10 +1409,13 @@ def build_sdkconfig(*args): | |
| base_config.append( | ||
| f'CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_{itm}=n' | ||
| ) | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. unneeded change |
||
| base_config.append(arg) | ||
| args.remove(arg) | ||
|
|
||
| elif arg.startswith("--"): | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Custom build arguments passed to make.py (e.g. --flash-size, --enable-uart) are not valid Make options.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no they are not, but when using a custom board those options should not be used in the build command and should instead be handled in the custom board. so when a user specifies a custom board and then uses those commands the commands are not parsed and get forwarded to makefile. What needs to be done is when a user uses a custom board and passes any arguments that should not be there an exception should be raised with a meaningful message about using those build command in combination with a custom bard. |
||
| args.remove(arg) | ||
|
|
||
| base_config.append(f'CONFIG_ESPTOOLPY_FLASHSIZE_{flash_size}MB=y') | ||
| base_config.append(''.join([ | ||
| 'CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=', | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This early return prevented inclusion of optional drivers (FROZEN_MANIFEST) and API generation (GEN_SCRIPT) when building for custom boards. It seems to be either an oversight or an unintended change. If this
if custom_board_path is not Nonecondition must be preserved, a flag could be added to differentiate the board type.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is intentional because everything done here is able to be done in the custom board files so it is not needed. The user needs to do this themselves in those board files.