Deprecate set_conf_file #13948
Deprecate set_conf_file #13948
Conversation
In-tree, all usage of 'set_conf_file' is implementing the same pattern (with some inconsequential differences). To reduce copy-paste and get closer to dropping support for 'set_conf_file', we include this pattern into the built-in set of patterns. 'set_conf_file' is causing issues for future extensions, e.g. multi-image support, and is also the source of a lot of duplicated code. Note support for 'set_conf_file' is not dropped, it is only marked as deprecated. Signed-off-by: Sebastian Bøe <[email protected]>
Port all users of 'set_conf_file' to use the built-in rules instead. This follows the convention-over-configuration principle to make the system as a whole simpler and more consistent. Signed-off-by: Sebastian Bøe <[email protected]>
SebastianBoe
requested review from
dbkinder,
jukkar,
nashif,
pfalcon,
tbursztyka and
vanwinkeljan
as code owners
|
@pfalcon : FYI |
| include($ENV{ZEPHYR_BASE}/samples/net/common/common.cmake) |
There was a problem hiding this comment.
True, but, we should have a newline at the end of the file.
I can create another commit for this, but I would prefer to leave it as-is.
There was a problem hiding this comment.
Adding a new commit into this set should not be a big issue. Don't you need to remove the extra CONFIG_I2C_VIRTUAL settings anyway?
| @@ -2,3 +2,4 @@ CONFIG_I2C_STM32_V2=y | |||
| CONFIG_I2C_STM32_INTERRUPT=y | |||
| CONFIG_I2C_1=y | |||
| CONFIG_I2C_2=y | |||
| CONFIG_I2C_VIRTUAL=n | |||
There was a problem hiding this comment.
Actually, it is related.
Unlike all other samples, i2c_slave_api had two different files for the "common" configuration.
One that was used when no board configuration was needed (prj_virtual.conf), and another that is combined with board config (prj_base.conf).
This pattern is not supported by boilerplate.cmake, so this sample was changed to only have one "common" config file (prj.conf). Doing so required modifying the board configuration files to disable some of the "common" configuration from prj_base.conf.
| @@ -2,3 +2,4 @@ CONFIG_I2C_STM32_V2=y | |||
| CONFIG_I2C_STM32_INTERRUPT=y | |||
| CONFIG_I2C_1=y | |||
| CONFIG_I2C_2=y | |||
| CONFIG_I2C_VIRTUAL=n | |||
Codecov Report
@@ Coverage Diff @@
## master #13948 +/- ##
==========================================
- Coverage 52.29% 52.25% -0.04%
==========================================
Files 307 307
Lines 45429 45429
Branches 10506 10506
==========================================
- Hits 23756 23740 -16
- Misses 16887 16899 +12
- Partials 4786 4790 +4
Continue to review full report at Codecov.
|
In-tree, all usage of 'set_conf_file' is implementing the same
pattern (with some inconsequential differences).
To reduce copy-paste and get closer to dropping support for
'set_conf_file', we include this pattern into the built-in set of
patterns.
'set_conf_file' is causing issues for future extensions,
e.g. multi-image support, and is also the source of a lot of
duplicated code.
Note support for 'set_conf_file' is not dropped, it is only marked as
deprecated.