boards: intel_s1000: fix up board.cmake #8076
Closed
Conversation
This file contains hidden or 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
added 2 commits
May 31, 2018 13:17
The runner argument backend currently no longer accepts setting common configuration values through board_runner_args() and board_finalize_runner_args(). This is affecting the intel_s1000 board's CMake configuration, causing errors when 'west flash' et al are run. However, the options in board_finalize_runner_args() appear to be unnecessary (and likely shouldn't be there at all), as they are just hard-coding the same values set elsewhere in the build system. Let's have a single point of truth and remove them from the board file. This has the side effect of restoring 'make flash'. Fixes: zephyrproject-rtos#7986 Signed-off-by: Marti Bolivar <[email protected]>
The file boards/common/intel_s1000_crb.board.cmake is not common at all; it is specific to this board. Move its contents into the board's board.cmake. Signed-off-by: Marti Bolivar <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #8076 +/- ##
=======================================
Coverage 64.54% 64.54%
=======================================
Files 420 420
Lines 40131 40131
Branches 6759 6759
=======================================
Hits 25903 25903
Misses 11106 11106
Partials 3122 3122Continue to review full report at Codecov.
|
|
This is redundant with #7986 |
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.
Clean up and fix the board-specific CMake files to restore 'make flash' etc. functionality.
(Speculative commit; I don't have this hardware and can't test this board.)
Fixes: #7986