bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boards: arm: argonkey: Properly set choice default

Browse Source 
The choice symbol LSM6DSL_EXT0_LIS2MDL was given a 'default' in
Kboards/arm/96b_argonkey/Kconfig.defconfig, but 'default' has no effect
on choice symbols, triggering a warning from Kconfiglib.

Instead of adding a default to the choice symbol, change the default of
the 'choice' itself by giving it name and adding the default in
Kconfig.defconfig.

This requires that we remove the default on the "base" definition of the
'choice', due to some messiness related to the Zephyr-specific
prefer-later-defaults behavior (see the 'Zephyr-specific Kconfig
behavior for defaults' section in the Board Porting Guide). Choices were
overlooked when that patch was added to the C tools, meaning choices
still prefer earlier defaults. The crux is that Kconfig.defconfig files
are included last.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2018-05-28 16:28:53 +02:00 committed by Anas Nashif
parent 9d8c630bcd
commit 10d54e2b22
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/arm/96b_argonkey/Kconfig.defconfig
View File

@ -53,8 +53,9 @@ endchoice
config LSM6DSL_SENSORHUB
default y
config LSM6DSL_EXT0_LIS2MDL
default y
choice LSM6DSL_EXTERNAL_SENSOR_0
default LSM6DSL_EXT0_LIS2MDL
endchoice
endif # LSM6DSL

5
drivers/sensor/lsm6dsl/Kconfig
View File

@ -198,16 +198,17 @@ config LSM6DSL_ENABLE_INTERNAL_PULLUP
bool "Enabled internals pull-up resistors"
default y
choice
choice LSM6DSL_EXTERNAL_SENSOR_0
prompt "External sensor 0"
default LSM6DSL_EXT0_LIS2MDL
help
Choose the external sensor 0 connected to LSM6DS3.
config LSM6DSL_EXT0_LIS2MDL
bool "LIS2MDL"
config LSM6DSL_EXT0_LPS22HB
bool "LPS22HB"
endchoice
endif #LSM6DSL_SENSORHUB