From d713033d5cd5041a2c315b8a970f1076ff71fe2d Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Wed, 5 Sep 2018 13:10:19 +0200 Subject: [PATCH] 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 --- Kconfig.zephyr | 4 ++-- arch/Kconfig | 2 +- boards/Kconfig | 4 ++-- doc/application/application-kconfig.include | 2 +- samples/drivers/CAN/Kconfig | 2 +- samples/net/gptp/Kconfig | 2 +- samples/net/lldp/Kconfig | 2 +- samples/net/stats/Kconfig | 2 +- samples/net/traffic_class/Kconfig | 2 +- samples/net/vlan/Kconfig | 2 +- samples/net/wifi/Kconfig | 2 +- tests/benchmarks/object_footprint/Kconfig | 2 +- tests/drivers/i2c/i2c_slave_api/Kconfig | 4 ++-- tests/drivers/spi/spi_loopback/Kconfig | 2 +- tests/kernel/arm_irq_vector_table/Kconfig | 3 ++- 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 8ac889bc44e..e5d219efef6 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -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" diff --git a/arch/Kconfig b/arch/Kconfig index c37ed4e597a..0629a61882b 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -13,7 +13,7 @@ source "boards/Kconfig" # Note: $ARCH might be a glob pattern -source "arch/$ARCH/Kconfig" +source "arch/$(ARCH)/Kconfig" choice diff --git a/boards/Kconfig b/boards/Kconfig index fed6af4c53d..3dc060313a1 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -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" diff --git a/doc/application/application-kconfig.include b/doc/application/application-kconfig.include index 9b046af1fc6..7aee3211187 100644 --- a/doc/application/application-kconfig.include +++ b/doc/application/application-kconfig.include @@ -2,4 +2,4 @@ mainmenu "Your Application Name" # Your application configuration options go here -source "$ZEPHYR_BASE/Kconfig.zephyr" +source "$(ZEPHYR_BASE)/Kconfig.zephyr" diff --git a/samples/drivers/CAN/Kconfig b/samples/drivers/CAN/Kconfig index e2a6876676b..b1fa910679a 100644 --- a/samples/drivers/CAN/Kconfig +++ b/samples/drivers/CAN/Kconfig @@ -46,4 +46,4 @@ config LOOPBACK_MODE This allows testing without a second board. -source "$ZEPHYR_BASE/Kconfig.zephyr" +source "$(ZEPHYR_BASE)/Kconfig.zephyr" diff --git a/samples/net/gptp/Kconfig b/samples/net/gptp/Kconfig index 884528d8d02..d60f66309d4 100644 --- a/samples/net/gptp/Kconfig +++ b/samples/net/gptp/Kconfig @@ -58,4 +58,4 @@ config NET_SAMPLE_IFACE3_VLAN_TAG endif -source "$ZEPHYR_BASE/Kconfig.zephyr" +source "$(ZEPHYR_BASE)/Kconfig.zephyr" diff --git a/samples/net/lldp/Kconfig b/samples/net/lldp/Kconfig index 631af071ebc..0891d5a0d91 100644 --- a/samples/net/lldp/Kconfig +++ b/samples/net/lldp/Kconfig @@ -10,7 +10,7 @@ mainmenu "LLDP sample application" -source "$ZEPHYR_BASE/Kconfig.zephyr" +source "$(ZEPHYR_BASE)/Kconfig.zephyr" if NET_LLDP diff --git a/samples/net/stats/Kconfig b/samples/net/stats/Kconfig index d240bc2ef85..f129ecf6f37 100644 --- a/samples/net/stats/Kconfig +++ b/samples/net/stats/Kconfig @@ -17,4 +17,4 @@ config SAMPLE_PERIOD Print statistics after every n. seconds -source "$ZEPHYR_BASE/Kconfig.zephyr" +source "$(ZEPHYR_BASE)/Kconfig.zephyr" diff --git a/samples/net/traffic_class/Kconfig b/samples/net/traffic_class/Kconfig index f756b24548c..e013e3a7be3 100644 --- a/samples/net/traffic_class/Kconfig +++ b/samples/net/traffic_class/Kconfig @@ -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" diff --git a/samples/net/vlan/Kconfig b/samples/net/vlan/Kconfig index 3f5b230d908..9df3728a26e 100644 --- a/samples/net/vlan/Kconfig +++ b/samples/net/vlan/Kconfig @@ -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" diff --git a/samples/net/wifi/Kconfig b/samples/net/wifi/Kconfig index 757283fb26f..349e468db73 100644 --- a/samples/net/wifi/Kconfig +++ b/samples/net/wifi/Kconfig @@ -17,4 +17,4 @@ config WINC1500_GPIO_RESET_N endif # WIFI_WINC1500 -source "$ZEPHYR_BASE/Kconfig.zephyr" +source "$(ZEPHYR_BASE)/Kconfig.zephyr" diff --git a/tests/benchmarks/object_footprint/Kconfig b/tests/benchmarks/object_footprint/Kconfig index 5443129cd89..e9348f2bfe6 100644 --- a/tests/benchmarks/object_footprint/Kconfig +++ b/tests/benchmarks/object_footprint/Kconfig @@ -1,6 +1,6 @@ mainmenu "Zephyr Object Sizes" -source "$ZEPHYR_BASE/Kconfig.zephyr" +source "$(ZEPHYR_BASE)/Kconfig.zephyr" config OBJECTS_PRINTK bool "use printk" diff --git a/tests/drivers/i2c/i2c_slave_api/Kconfig b/tests/drivers/i2c/i2c_slave_api/Kconfig index d85eba5ec74..83446e5cf38 100644 --- a/tests/drivers/i2c/i2c_slave_api/Kconfig +++ b/tests/drivers/i2c/i2c_slave_api/Kconfig @@ -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" diff --git a/tests/drivers/spi/spi_loopback/Kconfig b/tests/drivers/spi/spi_loopback/Kconfig index f821b39d24d..305e17844e0 100644 --- a/tests/drivers/spi/spi_loopback/Kconfig +++ b/tests/drivers/spi/spi_loopback/Kconfig @@ -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" diff --git a/tests/kernel/arm_irq_vector_table/Kconfig b/tests/kernel/arm_irq_vector_table/Kconfig index c59fd8b9819..fa3b27324d9 100644 --- a/tests/kernel/arm_irq_vector_table/Kconfig +++ b/tests/kernel/arm_irq_vector_table/Kconfig @@ -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"