Skip to content

uniflash.inc.mk: add variables for configuration files#11906

Merged
leandrolanzieri merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/makefiles/uniflash/config_variables
Jul 26, 2019
Merged

uniflash.inc.mk: add variables for configuration files#11906
leandrolanzieri merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/makefiles/uniflash/config_variables

Conversation

@cladmi
Copy link
Copy Markdown
Contributor

@cladmi cladmi commented Jul 24, 2019

Contribution description

Refactoring to use common variables for the configuration files.

This will allow overwriting the files more easily from outside.

This allows to locally handle setting the board serial with a custom ccxml file. Generated from the graphical interface or with a serial manually written

https://e2e.ti.com/support/tools/ccs/f/81/p/784244/2900415

Doing a global handling is planned but will require more testing and xml patching.

Testing procedure

The default value did not change from master:

touch dslite.sh

UNIFLASH_PATH=${PWD} BOARD=cc2650-launchpad make --no-print-directory -C examples/hello-world/ info-debug-variable-FFLAGS info-debug-variable-RESET_FLAGS info-debug-variable-DEBUGSERVER_FLAGS info-debug-variable-DEBUGGER_FLAGS
--config /home/harter/work/git/RIOT/boards/cc2650-launchpad/dist/cc26x0f128_XDS110.ccxml /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf

-p 3333 /home/harter/work/git/RIOT/boards/cc2650-launchpad/dist/cc26x0f128_XDS110.dat
-x /home/harter/work/git/RIOT/boards/cc2650-launchpad/dist/cc26x0f128_gdb.conf /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf

UNIFLASH_PATH=non_existent BOARD=cc2650-launchpad make --no-print-directory -C examples/hello-world/ info-debug-variable-FFLAGS info-debug-variable-RESET_FLAGS info-debug-variable-DEBUGSERVER_FLAGS info-debug-variable-DEBUGGER_FLAGS
-ccxml /home/harter/work/git/RIOT/boards/cc2650-launchpad/dist/cc26x0f128_XDS110.ccxml -program /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf
-ccxml /home/harter/work/git/RIOT/boards/cc2650-launchpad/dist/cc26x0f128_XDS110.ccxml -reset
-p 3333 /home/harter/work/git/RIOT/boards/cc2650-launchpad/dist/cc26x0f128_XDS110.dat
-x /home/harter/work/git/RIOT/boards/cc2650-launchpad/dist/cc26x0f128_gdb.conf /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf

The values can indeed be overwritten:

UNIFLASH_CONFIG_CCXML=overwritten_ccxml UNIFLASH_CONFIG_DAT=overwritten_dat UNIFLASH_CONFIG_GDB=overwritten_gdb UNIFLASH_PATH=${PWD} BOARD=cc2650-launchpad make --no-print-directory -C examples/hello-world/ info-debug-variable-FFLAGS info-debug-variable-RESET_FLAGS info-debug-variable-DEBUGSERVER_FLAGS info-debug-variable-DEBUGGER_FLAGS
--config overwritten_ccxml /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf

-p 3333 overwritten_dat
-x overwritten_gdb /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf

UNIFLASH_CONFIG_CCXML=overwritten_ccxml UNIFLASH_CONFIG_DAT=overwritten_dat UNIFLASH_CONFIG_GDB=overwritten_gdb UNIFLASH_PATH=non_existent BOARD=cc2650-launchpad make --no-print-directory -C examples/hello-world/ info-debug-variable-FFLAGS info-debug-variable-RESET_FLAGS info-debug-variable-DEBUGSERVER_FLAGS info-debug-variable-DEBUGGER_FLAGS
-ccxml overwritten_ccxml -program /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf
-ccxml overwritten_ccxml -reset
-p 3333 overwritten_dat
-x overwritten_gdb /home/harter/work/git/RIOT/examples/hello-world/bin/cc2650-launchpad/hello-world.elf

Issues/PRs references

Part of handling multiple boards on the same machine #10870

@cladmi
uniflash.inc.mk: add variables for configuration files
78b1ff3 
Refactoring to use common variables for the configuration files.

This will allow overwriting the files more easily from outside.
@leandrolanzieri leandrolanzieri added Area: build system Area: Build system Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation Reviewed: 1-fundamentals The fundamentals of the PR were reviewed according to the maintainer guidelines Reviewed: 2-code-design The code design of the PR was reviewed according to the maintainer guidelines Reviewed: 3-testing The PR was tested according to the maintainer guidelines Reviewed: 4-code-style The adherence to coding conventions by the PR were reviewed according to the maintainer guidelines CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jul 25, 2019
leandrolanzieri
leandrolanzieri approved these changes Jul 26, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@leandrolanzieri leandrolanzieri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Tested and the output is still the same as currently, but can be overridden. ACK!

@leandrolanzieri leandrolanzieri merged commit 959c55b into RIOT-OS:master Jul 26, 2019
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Jul 29, 2019

Thank you for the review.

@cladmi cladmi deleted the pr/makefiles/uniflash/config_variables branch July 29, 2019 06:44
@cladmi cladmi mentioned this pull request Jul 29, 2019
Closed
19 tasks
@kb2ma kb2ma added this to the Release 2019.10 milestone Sep 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leandrolanzieri leandrolanzieri leandrolanzieri approved these changes

Assignees

No one assigned

Labels

Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Reviewed: 1-fundamentals The fundamentals of the PR were reviewed according to the maintainer guidelines Reviewed: 2-code-design The code design of the PR was reviewed according to the maintainer guidelines Reviewed: 3-testing The PR was tested according to the maintainer guidelines Reviewed: 4-code-style The adherence to coding conventions by the PR were reviewed according to the maintainer guidelines Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

Release 2019.10

Development

Successfully merging this pull request may close these issues.

3 participants

@cladmi @leandrolanzieri @kb2ma