flasher_stub: Makefile changes for clarity and modularity (ESPTOOL-647) #858
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
changed the title
Rather than a special "make esp32", create WITHOUT_* variables to selectively disable chip families. Currently, WITHOUT_ESP8266, WITHOUT_ESP32_XTENSA and WITHOUT_ESP32_RISCV32 are defined, but the code can be easily adjusted to allow for all kinds of other sets/combinations.
Since commit 94f29a5 the flasher stub is not embedded in the Python source, but rather included as simple json files. As such, wrap_stub.py --embed was converted to basically just vary the build dir. Rather than keep this indirection and for better clarity, remove that piece of code and replace it by a simple "cp" in the Makefile. While at it, replace the target name from "embed" to "install", as this more akin to a "make install" step.
paravoid
force-pushed
the
flasher-stub-makefile
branch
from
47e2b25
to
6cd442e
Compare
|
@paravoid Thank you for taking the time and making these nice improvements. We will handle it soon. |
|
@paravoid thanks for contributing! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
As promised in #856, here are some flasher_stub Makefile changes that clean up the make code a little bit, and build up on 94f29a5 to remove some legacy code from wrap_stub.py.
I've split the changes into multiple incremental commits that are hopefully self-explanatory.
This PR is on top of "master" for ease of review, but can be rebased cleanly over #856.
I have tested this change with the following hardware & software combinations:
Debian sid with upstream toolchain as set up by ci/setup_ci_build_env.sh.
The built stubs (under
esptool/targets/stub_flasherdo not change), and so no hardware testing is required.