Kconfig: Use new preprocessor syntax for env. variables

With the new Kconfig preprocessor (described in
https://github.com/torvalds/linux/blob/master/Documentation/kbuild/
kconfig-macro-language.txt), the syntax for expanding environment
variables is $(FOO) rather than $FOO.

$(FOO) is a general preprocessor variable expansion, which falls back to
environment variables if the variable isn't set (like in Make). It can
also be used in prompts, 'comment's, etc.

The old syntax will probably be supported forever in Kconfiglib for
backwards compatibility, but might as well make it consistent now that
people might start using the preprocessor more.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2018-09-05 13:10:19 +02:00 committed by Anas Nashif
parent d0e8752a52
commit d713033d5c
15 changed files with 19 additions and 18 deletions

View File

@ -16,8 +16,8 @@
# overrides SoC values.
#
# Note: $ARCH and $BOARD_DIR might be glob patterns.
source "$BOARD_DIR/Kconfig.defconfig"
source "arch/$ARCH/soc/*/Kconfig.defconfig"
source "$(BOARD_DIR)/Kconfig.defconfig"
source "arch/$(ARCH)/soc/*/Kconfig.defconfig"
source "arch/Kconfig"

View File

@ -13,7 +13,7 @@
source "boards/Kconfig"
# Note: $ARCH might be a glob pattern
source "arch/$ARCH/Kconfig"
source "arch/$(ARCH)/Kconfig"
choice

View File

@ -17,13 +17,13 @@ config QEMU_TARGET
choice
prompt "Board Selection"
source "$BOARD_DIR/Kconfig.board"
source "$(BOARD_DIR)/Kconfig.board"
endchoice
menu "Board Options"
# There might not be any board options, hence the optional source
osource "$BOARD_DIR/Kconfig"
osource "$(BOARD_DIR)/Kconfig"
endmenu
menu "Shields"

View File

@ -2,4 +2,4 @@ mainmenu "Your Application Name"
# Your application configuration options go here
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"

View File

@ -46,4 +46,4 @@ config LOOPBACK_MODE
This allows testing without a second board.
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"

View File

@ -58,4 +58,4 @@ config NET_SAMPLE_IFACE3_VLAN_TAG
endif
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"

View File

@ -10,7 +10,7 @@
mainmenu "LLDP sample application"
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"
if NET_LLDP

View File

@ -17,4 +17,4 @@ config SAMPLE_PERIOD
Print statistics after every n. seconds
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"

View File

@ -45,4 +45,4 @@ config SAMPLE_PEER_IPV4_ADDR_2
The value depends on your network setup.
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"

View File

@ -35,4 +35,4 @@ config SAMPLE_IPV4_ADDR_2
The value depends on your network setup.
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"

View File

@ -17,4 +17,4 @@ config WINC1500_GPIO_RESET_N
endif # WIFI_WINC1500
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"

View File

@ -1,6 +1,6 @@
mainmenu "Zephyr Object Sizes"
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"
config OBJECTS_PRINTK
bool "use printk"

View File

@ -1,5 +1,5 @@
mainmenu "I2C Slave API Test"
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"
source "$ZEPHYR_BASE/tests/drivers/i2c/i2c_slave_api/common/Kconfig"
source "$(ZEPHYR_BASE)/tests/drivers/i2c/i2c_slave_api/common/Kconfig"

View File

@ -1,6 +1,6 @@
mainmenu "SPI Loopback Test"
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"
config SPI_LOOPBACK_DRV_NAME
string "SPI device name to use for test"

View File

@ -1,4 +1,5 @@
config NUM_IRQS
int "Number of IRQs for this test, made overridable in the .conf file"
default 3
source "$ZEPHYR_BASE/Kconfig.zephyr"
source "$(ZEPHYR_BASE)/Kconfig.zephyr"