diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 27104253020..516f588ee5e 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -15,9 +15,9 @@ # Board defaults should be parsed before SoC defaults, because boards usually # overrides SoC values. # -# $ENV_VAR_ARCH and $ENV_VAR_BOARD_DIR might be glob patterns -gsource "$ENV_VAR_BOARD_DIR/Kconfig.defconfig" -gsource "arch/$ENV_VAR_ARCH/soc/*/Kconfig.defconfig" +# Note: $ENV_VAR_ARCH and $ENV_VAR_BOARD_DIR might be glob patterns. +source "$ENV_VAR_BOARD_DIR/Kconfig.defconfig" +source "arch/$ENV_VAR_ARCH/soc/*/Kconfig.defconfig" source "arch/Kconfig" diff --git a/arch/Kconfig b/arch/Kconfig index 0e63a3c196c..fd737d9307b 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -12,8 +12,8 @@ # overriden (by defining symbols in multiple locations) source "boards/Kconfig" -# $ENV_VAR_ARCH might be a glob pattern -gsource "arch/$ENV_VAR_ARCH/Kconfig" +# Note: $ENV_VAR_ARCH might be a glob pattern +source "arch/$ENV_VAR_ARCH/Kconfig" choice diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index feb7bc7964b..f9bb71dd2b5 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -10,7 +10,7 @@ choice prompt "ARC SoC Selection" depends on ARC - gsource "arch/arc/soc/*/Kconfig.soc" + source "arch/arc/soc/*/Kconfig.soc" endchoice @@ -19,7 +19,7 @@ menu "ARC Options" # Include these first so that any properties (e.g. defaults) below can be # overriden (by defining symbols in multiple locations) -gsource "arch/arc/soc/*/Kconfig" +source "arch/arc/soc/*/Kconfig" config ARCH default "arc" diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3c182690cda..ea2534c86d3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -11,7 +11,7 @@ choice default SOC_SERIES_KINETIS_K6X depends on ARM - gsource "arch/arm/soc/*/Kconfig.soc" + source "arch/arm/soc/*/Kconfig.soc" endchoice menu "ARM Options" @@ -20,7 +20,7 @@ menu "ARM Options" menu "SoC Configuration" # Include these first so that any properties (e.g. defaults) below can be # overriden (by defining symbols in multiple locations) -gsource "arch/arm/soc/*/Kconfig" +source "arch/arm/soc/*/Kconfig" endmenu source "arch/arm/core/Kconfig" diff --git a/arch/arm/soc/arm/Kconfig b/arch/arm/soc/arm/Kconfig index 484edda40b8..7c393093f2d 100644 --- a/arch/arm/soc/arm/Kconfig +++ b/arch/arm/soc/arm/Kconfig @@ -14,5 +14,5 @@ config SOC_FAMILY string default "arm" -gsource "arch/arm/soc/arm/*/Kconfig.soc" +source "arch/arm/soc/arm/*/Kconfig.soc" endif # SOC_FAMILY_ARM diff --git a/arch/arm/soc/arm/Kconfig.defconfig b/arch/arm/soc/arm/Kconfig.defconfig index 752a0d7b498..765ebbcb42c 100644 --- a/arch/arm/soc/arm/Kconfig.defconfig +++ b/arch/arm/soc/arm/Kconfig.defconfig @@ -5,4 +5,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/arm/*/Kconfig.defconfig.series" +source "arch/arm/soc/arm/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/arm/Kconfig.soc b/arch/arm/soc/arm/Kconfig.soc index b298d3a46d7..649d83501d5 100644 --- a/arch/arm/soc/arm/Kconfig.soc +++ b/arch/arm/soc/arm/Kconfig.soc @@ -5,4 +5,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/arm/*/Kconfig.series" +source "arch/arm/soc/arm/*/Kconfig.series" diff --git a/arch/arm/soc/arm/beetle/Kconfig.defconfig.series b/arch/arm/soc/arm/beetle/Kconfig.defconfig.series index 291dad57061..d4d0a78b2b4 100644 --- a/arch/arm/soc/arm/beetle/Kconfig.defconfig.series +++ b/arch/arm/soc/arm/beetle/Kconfig.defconfig.series @@ -8,7 +8,7 @@ if SOC_SERIES_BEETLE -gsource "arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle*" +source "arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle*" config SOC_SERIES default "beetle" diff --git a/arch/arm/soc/arm/mps2/Kconfig.defconfig.series b/arch/arm/soc/arm/mps2/Kconfig.defconfig.series index 028fe4bf6fb..dccf8d0f0a4 100644 --- a/arch/arm/soc/arm/mps2/Kconfig.defconfig.series +++ b/arch/arm/soc/arm/mps2/Kconfig.defconfig.series @@ -13,6 +13,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC int default 25000000 -gsource "arch/arm/soc/arm/mps2/Kconfig.defconfig.mps2*" +source "arch/arm/soc/arm/mps2/Kconfig.defconfig.mps2*" endif # SOC_SERIES_MPS2 diff --git a/arch/arm/soc/atmel_sam/Kconfig b/arch/arm/soc/atmel_sam/Kconfig index c8b219c6bcf..3a3c341c584 100644 --- a/arch/arm/soc/atmel_sam/Kconfig +++ b/arch/arm/soc/atmel_sam/Kconfig @@ -14,6 +14,6 @@ config SOC_FAMILY default "atmel_sam" # Select SoC Part No. and configuration options -gsource "arch/arm/soc/atmel_sam/*/Kconfig.soc" +source "arch/arm/soc/atmel_sam/*/Kconfig.soc" endif # SOC_FAMILY_SAM diff --git a/arch/arm/soc/atmel_sam/Kconfig.defconfig b/arch/arm/soc/atmel_sam/Kconfig.defconfig index d02e6c2ec7b..e51abe31d4f 100644 --- a/arch/arm/soc/atmel_sam/Kconfig.defconfig +++ b/arch/arm/soc/atmel_sam/Kconfig.defconfig @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/atmel_sam/*/Kconfig.defconfig.series" +source "arch/arm/soc/atmel_sam/*/Kconfig.defconfig.series" if SOC_FAMILY_SAM diff --git a/arch/arm/soc/atmel_sam/Kconfig.soc b/arch/arm/soc/atmel_sam/Kconfig.soc index 584525cd171..c98fb93e9b7 100644 --- a/arch/arm/soc/atmel_sam/Kconfig.soc +++ b/arch/arm/soc/atmel_sam/Kconfig.soc @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/atmel_sam/*/Kconfig.series" +source "arch/arm/soc/atmel_sam/*/Kconfig.series" diff --git a/arch/arm/soc/atmel_sam0/Kconfig b/arch/arm/soc/atmel_sam0/Kconfig index b1a608b8094..35da05da02f 100644 --- a/arch/arm/soc/atmel_sam0/Kconfig +++ b/arch/arm/soc/atmel_sam0/Kconfig @@ -13,5 +13,5 @@ config SOC_FAMILY default "atmel_sam0" source arch/arm/soc/atmel_sam0/common/Kconfig.samd2x -gsource "arch/arm/soc/atmel_sam0/*/Kconfig.soc" +source "arch/arm/soc/atmel_sam0/*/Kconfig.soc" endif diff --git a/arch/arm/soc/atmel_sam0/Kconfig.defconfig b/arch/arm/soc/atmel_sam0/Kconfig.defconfig index 4599d33641e..e9d2a6c54f5 100644 --- a/arch/arm/soc/atmel_sam0/Kconfig.defconfig +++ b/arch/arm/soc/atmel_sam0/Kconfig.defconfig @@ -3,4 +3,4 @@ # Copyright (c) 2017 Google LLC. # SPDX-License-Identifier: Apache-2.0 -gsource "arch/arm/soc/atmel_sam0/*/Kconfig.defconfig.series" +source "arch/arm/soc/atmel_sam0/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/atmel_sam0/Kconfig.soc b/arch/arm/soc/atmel_sam0/Kconfig.soc index e38b6d5381a..9ef04d42555 100644 --- a/arch/arm/soc/atmel_sam0/Kconfig.soc +++ b/arch/arm/soc/atmel_sam0/Kconfig.soc @@ -3,4 +3,4 @@ # Copyright (c) 2017 Google LLC. # SPDX-License-Identifier: Apache-2.0 -gsource "arch/arm/soc/atmel_sam0/*/Kconfig.series" +source "arch/arm/soc/atmel_sam0/*/Kconfig.series" diff --git a/arch/arm/soc/nordic_nrf/Kconfig b/arch/arm/soc/nordic_nrf/Kconfig index 638660223bb..f645f1a4e51 100644 --- a/arch/arm/soc/nordic_nrf/Kconfig +++ b/arch/arm/soc/nordic_nrf/Kconfig @@ -15,6 +15,6 @@ config SOC_FAMILY default "nordic_nrf" source "arch/arm/soc/nordic_nrf/Kconfig.peripherals" -gsource "arch/arm/soc/nordic_nrf/*/Kconfig.soc" +source "arch/arm/soc/nordic_nrf/*/Kconfig.soc" endif # SOC_FAMILY_NRF diff --git a/arch/arm/soc/nordic_nrf/Kconfig.defconfig b/arch/arm/soc/nordic_nrf/Kconfig.defconfig index 63729f0bef7..1c9c829c52e 100644 --- a/arch/arm/soc/nordic_nrf/Kconfig.defconfig +++ b/arch/arm/soc/nordic_nrf/Kconfig.defconfig @@ -7,7 +7,7 @@ if SOC_FAMILY_NRF -gsource "arch/arm/soc/nordic_nrf/*/Kconfig.defconfig.series" +source "arch/arm/soc/nordic_nrf/*/Kconfig.defconfig.series" config BUILD_OUTPUT_HEX default y diff --git a/arch/arm/soc/nordic_nrf/Kconfig.soc b/arch/arm/soc/nordic_nrf/Kconfig.soc index 67a97be4c77..f9c59a31a8b 100644 --- a/arch/arm/soc/nordic_nrf/Kconfig.soc +++ b/arch/arm/soc/nordic_nrf/Kconfig.soc @@ -5,5 +5,5 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/nordic_nrf/*/Kconfig.series" +source "arch/arm/soc/nordic_nrf/*/Kconfig.series" diff --git a/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series index eafc158300d..fdf10e90eec 100644 --- a/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series +++ b/arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.series @@ -8,7 +8,7 @@ if SOC_SERIES_NRF51X -gsource "arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51*" +source "arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51*" config SOC_SERIES default "nrf51" diff --git a/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series index 6dd8b2ff1b1..66dc4fb77d8 100644 --- a/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series +++ b/arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_NRF52X -gsource "arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52*" +source "arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52*" config SOC_SERIES default "nrf52" diff --git a/arch/arm/soc/nxp_imx/Kconfig b/arch/arm/soc/nxp_imx/Kconfig index d137423c56f..c41191efa8b 100644 --- a/arch/arm/soc/nxp_imx/Kconfig +++ b/arch/arm/soc/nxp_imx/Kconfig @@ -14,7 +14,7 @@ config SOC_FAMILY string default "nxp_imx" -gsource "arch/arm/soc/nxp_imx/*/Kconfig.soc" +source "arch/arm/soc/nxp_imx/*/Kconfig.soc" config SOC_PART_NUMBER string diff --git a/arch/arm/soc/nxp_imx/Kconfig.defconfig b/arch/arm/soc/nxp_imx/Kconfig.defconfig index 838492b8db9..2baa0d2099e 100644 --- a/arch/arm/soc/nxp_imx/Kconfig.defconfig +++ b/arch/arm/soc/nxp_imx/Kconfig.defconfig @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/nxp_imx/*/Kconfig.defconfig.series" +source "arch/arm/soc/nxp_imx/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/nxp_imx/Kconfig.soc b/arch/arm/soc/nxp_imx/Kconfig.soc index d19530729ca..0b399381d1f 100644 --- a/arch/arm/soc/nxp_imx/Kconfig.soc +++ b/arch/arm/soc/nxp_imx/Kconfig.soc @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/nxp_imx/*/Kconfig.series" +source "arch/arm/soc/nxp_imx/*/Kconfig.series" diff --git a/arch/arm/soc/nxp_imx/rt/Kconfig.defconfig.series b/arch/arm/soc/nxp_imx/rt/Kconfig.defconfig.series index 4e1721bf090..29c2216176b 100644 --- a/arch/arm/soc/nxp_imx/rt/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_imx/rt/Kconfig.defconfig.series @@ -15,6 +15,6 @@ config NUM_IRQS # must be >= the highest interrupt number used default 160 -gsource "arch/arm/soc/nxp_imx/rt/Kconfig.defconfig.mimxrt*" +source "arch/arm/soc/nxp_imx/rt/Kconfig.defconfig.mimxrt*" endif # SOC_SERIES_IMX_RT diff --git a/arch/arm/soc/nxp_kinetis/Kconfig b/arch/arm/soc/nxp_kinetis/Kconfig index 258eb0c7a36..888eba188d1 100644 --- a/arch/arm/soc/nxp_kinetis/Kconfig +++ b/arch/arm/soc/nxp_kinetis/Kconfig @@ -15,7 +15,7 @@ config SOC_FAMILY string default "nxp_kinetis" -gsource "arch/arm/soc/nxp_kinetis/*/Kconfig.soc" +source "arch/arm/soc/nxp_kinetis/*/Kconfig.soc" config SOC_PART_NUMBER string diff --git a/arch/arm/soc/nxp_kinetis/Kconfig.defconfig b/arch/arm/soc/nxp_kinetis/Kconfig.defconfig index 56949c90107..7ceb7a560b6 100644 --- a/arch/arm/soc/nxp_kinetis/Kconfig.defconfig +++ b/arch/arm/soc/nxp_kinetis/Kconfig.defconfig @@ -1 +1 @@ -gsource "arch/arm/soc/nxp_kinetis/*/Kconfig.defconfig.series" +source "arch/arm/soc/nxp_kinetis/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/nxp_kinetis/Kconfig.soc b/arch/arm/soc/nxp_kinetis/Kconfig.soc index 822df007dda..31cadb6126b 100644 --- a/arch/arm/soc/nxp_kinetis/Kconfig.soc +++ b/arch/arm/soc/nxp_kinetis/Kconfig.soc @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/nxp_kinetis/*/Kconfig.series" +source "arch/arm/soc/nxp_kinetis/*/Kconfig.series" diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series index 79ce1f4e8f5..e757103fc3c 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series @@ -16,6 +16,6 @@ config NUM_IRQS # must be >= the highest interrupt number used default 86 -gsource "arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk*" +source "arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk*" endif # SOC_SERIES_KINETIS_K6X diff --git a/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.series b/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.series index bf7a9b62775..40888c1ce08 100644 --- a/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.series @@ -10,6 +10,6 @@ if SOC_SERIES_KINETIS_KL2X config SOC_SERIES default "kl2x" -gsource "arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mk*" +source "arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mk*" endif # SOC_SERIES_KINETIS_KL2X diff --git a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series index f88e7d5aeba..9045eb9e931 100644 --- a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.series @@ -10,6 +10,6 @@ if SOC_SERIES_KINETIS_KWX config SOC_SERIES default "kwx" -gsource "arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mk*" +source "arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mk*" endif # SOC_SERIES_KINETIS_KWX diff --git a/arch/arm/soc/nxp_lpc/Kconfig b/arch/arm/soc/nxp_lpc/Kconfig index d04bf5a07aa..6456a3a844b 100644 --- a/arch/arm/soc/nxp_lpc/Kconfig +++ b/arch/arm/soc/nxp_lpc/Kconfig @@ -14,7 +14,7 @@ config SOC_FAMILY string default "nxp_lpc" -gsource "arch/arm/soc/nxp_lpc/*/Kconfig.soc" +source "arch/arm/soc/nxp_lpc/*/Kconfig.soc" config SOC_PART_NUMBER string diff --git a/arch/arm/soc/nxp_lpc/Kconfig.defconfig b/arch/arm/soc/nxp_lpc/Kconfig.defconfig index a5c8eb98bd7..3a8e4a1d068 100644 --- a/arch/arm/soc/nxp_lpc/Kconfig.defconfig +++ b/arch/arm/soc/nxp_lpc/Kconfig.defconfig @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/nxp_lpc/*/Kconfig.defconfig.series" +source "arch/arm/soc/nxp_lpc/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/nxp_lpc/Kconfig.soc b/arch/arm/soc/nxp_lpc/Kconfig.soc index f38ae1c3922..5e2b5e861af 100644 --- a/arch/arm/soc/nxp_lpc/Kconfig.soc +++ b/arch/arm/soc/nxp_lpc/Kconfig.soc @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/nxp_lpc/*/Kconfig.series" +source "arch/arm/soc/nxp_lpc/*/Kconfig.series" diff --git a/arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.series b/arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.series index d7c94f2e613..2120030d27c 100644 --- a/arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.series @@ -15,6 +15,6 @@ config NUM_IRQS # must be >= the highest interrupt number used default 40 -gsource "arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.lp*" +source "arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.lp*" endif # SOC_SERIES_LPC54XXX diff --git a/arch/arm/soc/silabs_exx32/Kconfig b/arch/arm/soc/silabs_exx32/Kconfig index 472580d2703..81cee34a0cd 100644 --- a/arch/arm/soc/silabs_exx32/Kconfig +++ b/arch/arm/soc/silabs_exx32/Kconfig @@ -13,7 +13,7 @@ config SOC_FAMILY string default "silabs_exx32" -gsource "arch/arm/soc/silabs_exx32/*/Kconfig.soc" +source "arch/arm/soc/silabs_exx32/*/Kconfig.soc" config SOC_PART_NUMBER string diff --git a/arch/arm/soc/silabs_exx32/Kconfig.defconfig b/arch/arm/soc/silabs_exx32/Kconfig.defconfig index 51c242aa5f3..129445c29c7 100644 --- a/arch/arm/soc/silabs_exx32/Kconfig.defconfig +++ b/arch/arm/soc/silabs_exx32/Kconfig.defconfig @@ -1 +1 @@ -gsource "arch/arm/soc/silabs_exx32/*/Kconfig.defconfig.series" +source "arch/arm/soc/silabs_exx32/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/silabs_exx32/Kconfig.soc b/arch/arm/soc/silabs_exx32/Kconfig.soc index 7cacbe0ac3b..dc332fdb10b 100644 --- a/arch/arm/soc/silabs_exx32/Kconfig.soc +++ b/arch/arm/soc/silabs_exx32/Kconfig.soc @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/silabs_exx32/*/Kconfig.series" +source "arch/arm/soc/silabs_exx32/*/Kconfig.series" diff --git a/arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.series b/arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.series index d6eeb4420c0..eb4f90a41b4 100644 --- a/arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.series +++ b/arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.series @@ -16,6 +16,6 @@ config NUM_IRQS # must be >= the highest interrupt number used default 39 -gsource "arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.e*" +source "arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.e*" endif # SOC_SERIES_EFM32WG diff --git a/arch/arm/soc/silabs_exx32/efr32fg1p/Kconfig.defconfig.series b/arch/arm/soc/silabs_exx32/efr32fg1p/Kconfig.defconfig.series index b0662e3153f..db9b60aa39a 100644 --- a/arch/arm/soc/silabs_exx32/efr32fg1p/Kconfig.defconfig.series +++ b/arch/arm/soc/silabs_exx32/efr32fg1p/Kconfig.defconfig.series @@ -16,6 +16,6 @@ config NUM_IRQS # must be >= the highest interrupt number used default 33 -gsource "arch/arm/soc/silabs_exx32/efr32fg1p/Kconfig.defconfig.e*" +source "arch/arm/soc/silabs_exx32/efr32fg1p/Kconfig.defconfig.e*" endif # SOC_SERIES_EFR32FG1P diff --git a/arch/arm/soc/st_stm32/Kconfig b/arch/arm/soc/st_stm32/Kconfig index afb3c842a8a..b99c986384e 100644 --- a/arch/arm/soc/st_stm32/Kconfig +++ b/arch/arm/soc/st_stm32/Kconfig @@ -25,6 +25,6 @@ config STM32_ARM_MPU_ENABLE help Enable MPU support on STM32 SoCs -gsource "arch/arm/soc/st_stm32/*/Kconfig.soc" +source "arch/arm/soc/st_stm32/*/Kconfig.soc" endif # SOC_FAMILY_STM32 diff --git a/arch/arm/soc/st_stm32/Kconfig.defconfig b/arch/arm/soc/st_stm32/Kconfig.defconfig index 8bb2d76889d..cd94a36ca59 100644 --- a/arch/arm/soc/st_stm32/Kconfig.defconfig +++ b/arch/arm/soc/st_stm32/Kconfig.defconfig @@ -1 +1 @@ -gsource "arch/arm/soc/st_stm32/*/Kconfig.defconfig.series" +source "arch/arm/soc/st_stm32/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/st_stm32/Kconfig.soc b/arch/arm/soc/st_stm32/Kconfig.soc index bffe8d10941..5f2c10840fc 100644 --- a/arch/arm/soc/st_stm32/Kconfig.soc +++ b/arch/arm/soc/st_stm32/Kconfig.soc @@ -5,4 +5,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/arm/soc/st_stm32/*/Kconfig.series" +source "arch/arm/soc/st_stm32/*/Kconfig.series" diff --git a/arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.series index ea693b4bb67..5e3c2438d6c 100644 --- a/arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_STM32F0X -gsource "arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.stm32f0*" +source "arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.stm32f0*" config SOC_SERIES default "stm32f0" diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.series index e160aef4a68..c8b218c69c2 100644 --- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_STM32F1X -gsource "arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f1*" +source "arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f1*" config SOC_SERIES default "stm32f1" diff --git a/arch/arm/soc/st_stm32/stm32f2/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32f2/Kconfig.defconfig.series index 5dcd8793e09..8e67f9fa954 100644 --- a/arch/arm/soc/st_stm32/stm32f2/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32f2/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_STM32F2X -gsource "arch/arm/soc/st_stm32/stm32f2/Kconfig.defconfig.stm32f2*" +source "arch/arm/soc/st_stm32/stm32f2/Kconfig.defconfig.stm32f2*" config SOC_SERIES default "stm32f2" diff --git a/arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.series index 4101d51158e..11ec438f887 100644 --- a/arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_STM32F3X -gsource "arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.stm32f3*" +source "arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.stm32f3*" config SOC_SERIES default "stm32f3" diff --git a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.series index c8619272cf1..cc559900ef1 100644 --- a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_STM32F4X -gsource "arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f4*" +source "arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f4*" config SOC_SERIES default "stm32f4" diff --git a/arch/arm/soc/st_stm32/stm32f7/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32f7/Kconfig.defconfig.series index 4d3372a93b8..9e029ad5531 100644 --- a/arch/arm/soc/st_stm32/stm32f7/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32f7/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_STM32F7X -gsource "arch/arm/soc/st_stm32/stm32f7/Kconfig.defconfig.stm32f7*" +source "arch/arm/soc/st_stm32/stm32f7/Kconfig.defconfig.stm32f7*" config SOC_SERIES default "stm32f7" diff --git a/arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.series index be311039bef..ba40e33b0e5 100644 --- a/arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_STM32L0X -gsource "arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.stm32l0*" +source "arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.stm32l0*" config SOC_SERIES default "stm32l0" diff --git a/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.series index 129d581bb5c..f502913eefc 100644 --- a/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.series +++ b/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.series @@ -8,7 +8,7 @@ if SOC_SERIES_STM32L4X -gsource "arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l4*" +source "arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l4*" config SOC_SERIES default "stm32l4" diff --git a/arch/arm/soc/ti_simplelink/Kconfig b/arch/arm/soc/ti_simplelink/Kconfig index e83232c8a97..ed8a82d8629 100644 --- a/arch/arm/soc/ti_simplelink/Kconfig +++ b/arch/arm/soc/ti_simplelink/Kconfig @@ -10,5 +10,5 @@ config SOC_FAMILY string default "ti_simplelink" -gsource "arch/arm/soc/ti_simplelink/*/Kconfig.soc" +source "arch/arm/soc/ti_simplelink/*/Kconfig.soc" endif # SOC_FAMILY_TISIMPLELINK diff --git a/arch/arm/soc/ti_simplelink/Kconfig.defconfig b/arch/arm/soc/ti_simplelink/Kconfig.defconfig index 30ddf2a6100..98f6ef6dcf9 100644 --- a/arch/arm/soc/ti_simplelink/Kconfig.defconfig +++ b/arch/arm/soc/ti_simplelink/Kconfig.defconfig @@ -1 +1 @@ -gsource "arch/arm/soc/ti_simplelink/*/Kconfig.defconfig.series" +source "arch/arm/soc/ti_simplelink/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/ti_simplelink/Kconfig.soc b/arch/arm/soc/ti_simplelink/Kconfig.soc index 47b66fc7c5c..d17c7ca69f3 100644 --- a/arch/arm/soc/ti_simplelink/Kconfig.soc +++ b/arch/arm/soc/ti_simplelink/Kconfig.soc @@ -1,4 +1,4 @@ # Kconfig - Texas Instruments SimpleLink Family # -gsource "arch/arm/soc/ti_simplelink/*/Kconfig.series" +source "arch/arm/soc/ti_simplelink/*/Kconfig.series" diff --git a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series index 7f22c811078..075befdfc31 100644 --- a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series +++ b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.series @@ -3,7 +3,7 @@ if SOC_SERIES_CC32XX -gsource "arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc32*" +source "arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc32*" config SOC_SERIES default "cc32xx" diff --git a/arch/arm/soc/ti_simplelink/msp432p4xx/Kconfig.defconfig.series b/arch/arm/soc/ti_simplelink/msp432p4xx/Kconfig.defconfig.series index 1c1bb34c80e..44187d029a0 100644 --- a/arch/arm/soc/ti_simplelink/msp432p4xx/Kconfig.defconfig.series +++ b/arch/arm/soc/ti_simplelink/msp432p4xx/Kconfig.defconfig.series @@ -7,7 +7,7 @@ if SOC_SERIES_MSP432P4XX -gsource "arch/arm/soc/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p4*" +source "arch/arm/soc/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p4*" config SOC_SERIES default "msp432p4xx" diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 42c95fdad0d..38e338d0219 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -7,7 +7,7 @@ choice prompt "Nios II configuration selection" depends on NIOS2 - gsource "arch/nios2/soc/*/Kconfig.soc" + source "arch/nios2/soc/*/Kconfig.soc" endchoice menu "Nios II Options" @@ -15,7 +15,9 @@ menu "Nios II Options" # Include these first so that any properties (e.g. defaults) below can be # overriden (by defining symbols in multiple locations) -gsource "arch/nios2/soc/*/Kconfig" +# +# (No SoC-specific Kconfig files as of writing, hence the optional source.) +osource "arch/nios2/soc/*/Kconfig" config ARCH string diff --git a/arch/posix/Kconfig b/arch/posix/Kconfig index 41c33be2def..5f75213059d 100644 --- a/arch/posix/Kconfig +++ b/arch/posix/Kconfig @@ -10,7 +10,7 @@ choice prompt "POSIX Configuration Selection" depends on ARCH_POSIX - gsource "arch/posix/soc/*/Kconfig.soc" + source "arch/posix/soc/*/Kconfig.soc" endchoice menu "POSIX (native) Options" @@ -18,7 +18,9 @@ menu "POSIX (native) Options" # Include these first so that any properties (e.g. defaults) below can be # overriden (by defining symbols in multiple locations) -gsource "arch/posix/soc/*/Kconfig" +# +# (No SoC-specific Kconfig files as of writing, hence the optional source.) +osource "arch/posix/soc/*/Kconfig" config ARCH default "posix" diff --git a/arch/riscv32/Kconfig b/arch/riscv32/Kconfig index fcea74a309b..a4b3169f877 100644 --- a/arch/riscv32/Kconfig +++ b/arch/riscv32/Kconfig @@ -7,7 +7,7 @@ choice prompt "RISCV32 configuration selection" depends on RISCV32 - gsource "arch/riscv32/soc/*/Kconfig.soc" + source "arch/riscv32/soc/*/Kconfig.soc" endchoice menu "RISCV32 Options" @@ -15,7 +15,7 @@ menu "RISCV32 Options" # Include these first so that any properties (e.g. defaults) below can be # overriden (by defining symbols in multiple locations) -gsource "arch/riscv32/soc/*/Kconfig" +source "arch/riscv32/soc/*/Kconfig" config ARCH string diff --git a/arch/riscv32/soc/riscv-privilege/Kconfig b/arch/riscv32/soc/riscv-privilege/Kconfig index 11e4eb3769e..d026ff3a038 100644 --- a/arch/riscv32/soc/riscv-privilege/Kconfig +++ b/arch/riscv32/soc/riscv-privilege/Kconfig @@ -22,4 +22,4 @@ config RISCV_HAS_PLIC Does the SOC provide support for a Platform Level Interrupt Controller -gsource "arch/riscv32/soc/riscv-privilege/*/Kconfig.soc" +source "arch/riscv32/soc/riscv-privilege/*/Kconfig.soc" diff --git a/arch/riscv32/soc/riscv-privilege/Kconfig.defconfig b/arch/riscv32/soc/riscv-privilege/Kconfig.defconfig index 4732f8d850d..365b72a7a58 100644 --- a/arch/riscv32/soc/riscv-privilege/Kconfig.defconfig +++ b/arch/riscv32/soc/riscv-privilege/Kconfig.defconfig @@ -4,4 +4,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/riscv32/soc/riscv-privilege/*/Kconfig.defconfig.series" +source "arch/riscv32/soc/riscv-privilege/*/Kconfig.defconfig.series" diff --git a/arch/riscv32/soc/riscv-privilege/Kconfig.soc b/arch/riscv32/soc/riscv-privilege/Kconfig.soc index 0c2f90098db..12ee3fed8b4 100644 --- a/arch/riscv32/soc/riscv-privilege/Kconfig.soc +++ b/arch/riscv32/soc/riscv-privilege/Kconfig.soc @@ -5,4 +5,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/riscv32/soc/riscv-privilege/*/Kconfig.series" +source "arch/riscv32/soc/riscv-privilege/*/Kconfig.series" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f46c1697e42..9f17d3fb8f8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -10,7 +10,7 @@ choice prompt "x86 SoC Selection" depends on X86 - gsource "arch/x86/soc/*/Kconfig.soc" + source "arch/x86/soc/*/Kconfig.soc" endchoice menu "X86 Architecture Options" @@ -18,7 +18,7 @@ menu "X86 Architecture Options" # Include these first so that any properties (e.g. defaults) below can be # overriden (by defining symbols in multiple locations) -gsource "arch/x86/soc/*/Kconfig" +source "arch/x86/soc/*/Kconfig" config ARCH default "x86" diff --git a/arch/x86/soc/intel_quark/Kconfig b/arch/x86/soc/intel_quark/Kconfig index 83881506015..e73a68af339 100644 --- a/arch/x86/soc/intel_quark/Kconfig +++ b/arch/x86/soc/intel_quark/Kconfig @@ -13,6 +13,6 @@ config SOC_FAMILY default "intel_quark" endif -gsource "arch/x86/soc/intel_quark/*/Kconfig.soc" +source "arch/x86/soc/intel_quark/*/Kconfig.soc" -gsource "arch/x86/soc/intel_quark/*/Kconfig" +source "arch/x86/soc/intel_quark/*/Kconfig" diff --git a/arch/x86/soc/intel_quark/Kconfig.defconfig b/arch/x86/soc/intel_quark/Kconfig.defconfig index b4a4d3f46a8..2908606825c 100644 --- a/arch/x86/soc/intel_quark/Kconfig.defconfig +++ b/arch/x86/soc/intel_quark/Kconfig.defconfig @@ -1 +1 @@ -gsource "arch/x86/soc/intel_quark/*/Kconfig.defconfig.series" +source "arch/x86/soc/intel_quark/*/Kconfig.defconfig.series" diff --git a/arch/x86/soc/intel_quark/Kconfig.soc b/arch/x86/soc/intel_quark/Kconfig.soc index a9a57c8581f..de93ceb83ce 100644 --- a/arch/x86/soc/intel_quark/Kconfig.soc +++ b/arch/x86/soc/intel_quark/Kconfig.soc @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -gsource "arch/x86/soc/intel_quark/*/Kconfig.series" +source "arch/x86/soc/intel_quark/*/Kconfig.series" diff --git a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series b/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series index eba8c2d3e12..76ecbe3832d 100644 --- a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series +++ b/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series @@ -201,7 +201,7 @@ config USB_DW_IRQ_PRI default 3 endif # USB -gsource "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se*" -gsource "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie*" +source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se*" +source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie*" endif # SOC_SERIES_QUARK_SE diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 987a1e8a404..f4bac0b0a33 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -6,7 +6,7 @@ choice prompt "XTENSA core Selection" depends on XTENSA - gsource "arch/xtensa/soc/*/Kconfig.soc" + source "arch/xtensa/soc/*/Kconfig.soc" endchoice menu "XTENSA Options" @@ -16,7 +16,9 @@ menu "Specific core configuration" # Include these first so that any properties (e.g. defaults) below can be # overriden (by defining symbols in multiple locations) -gsource "arch/xtensa/soc/*/Kconfig" +# +# (No SoC-specific Kconfig files as of writing, hence the optional source.) +osource "arch/xtensa/soc/*/Kconfig" config IRQ_OFFLOAD_INTNUM int "IRQ offload SW interrupt index" diff --git a/boards/Kconfig b/boards/Kconfig index 3e9566fc28d..fb15f8c6862 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -13,16 +13,17 @@ config QEMU_TARGET Mark all QEMU targets with this variable for checking whether we are running in an emulated environment. -# $ENV_VAR_BOARD_DIR might be a glob pattern +# Note: $ENV_VAR_BOARD_DIR might be a glob pattern choice prompt "Board Selection" -gsource "$ENV_VAR_BOARD_DIR/Kconfig.board" +source "$ENV_VAR_BOARD_DIR/Kconfig.board" endchoice menu "Board Options" -gsource "$ENV_VAR_BOARD_DIR/Kconfig" +# There might not be any board options, hence the optional source +osource "$ENV_VAR_BOARD_DIR/Kconfig" endmenu menu "Shields" diff --git a/doc/porting/board_porting.rst b/doc/porting/board_porting.rst index c4e3d09ad4c..84a5f676311 100644 --- a/doc/porting/board_porting.rst +++ b/doc/porting/board_porting.rst @@ -336,19 +336,18 @@ as the corresponding environment variables. .. note:: - As of writing, there are plans to remove ``option env`` from the C tools as - well. + ``option env`` has been removed from the C tools in Linux 4.18 as well. The following Kconfig extensions are available: -- The ``gsource`` statement, which includes each file matching a given wildcard - pattern. +- The ``source`` statement supports glob patterns and includes each matching + file. A pattern is required to match at least one file. Consider the following example: .. code-block:: none - gsource "foo/bar/*/Kconfig" + source "foo/bar/*/Kconfig" If the pattern ``foo/bar/*/Kconfig`` matches the files :file:`foo/bar/baz/Kconfig` and :file:`foo/bar/qaz/Kconfig`, the statement @@ -359,39 +358,25 @@ The following Kconfig extensions are available: source "foo/bar/baz/Kconfig" source "foo/bar/qaz/Kconfig" - .. note + .. note:: The wildcard patterns accepted are the same as for the Python `glob `_ module. - If no files match the pattern, ``gsource`` has no effect. This means that - ``gsource`` also functions as an "optional" include statement (similar to - ``-include`` in Make): + If no files match the pattern, an error is generated. - .. code-block:: none - - gsource "foo/include-if-exists" + For cases where it's okay for a pattern to match no files (or for a plain + filename to not exist), a separate ``osource`` (*optional source*) statement + is available. ``osource`` is a no-op in case of no matches. .. note:: - Wildcard patterns that do not include any wildcard symbols (e.g., ``*``) - only match exactly the filename given, and only match it if the file - exists. + ``source`` and ``osource`` are analogous to ``include`` and + ``-include`` in Make. - It might help to think of *g* as standing for *generalized* rather than - *glob* in this case. - - .. note:: - - Only use ``gsource`` if you need it. Trying to ``source`` a non-existent - file produces an error, while ``gsource`` silently ignores missing files. - ``source`` also makes it clearer which files are being included. - -- The ``rsource`` statement, which includes a file specified with a relative - path. - - The path is relative to the directory of the :file:`Kconfig` file that has - the ``rsource`` statement. +- An ``rsource`` statement is available for including files specified with a + relative path. The path is relative to the directory of the :file:`Kconfig` + file that contains the ``rsource`` statement. As an example, assume that :file:`foo/Kconfig` is the top-level :file:`Kconfig` file, and that :file:`foo/bar/Kconfig` has the following @@ -408,14 +393,18 @@ The following Kconfig extensions are available: ``rsource`` can be used to create :file:`Kconfig` "subtrees" that can be moved around freely. -- The ``grsource`` statement, which combines ``gsource`` and ``rsource``. + .. note:: + + ``rsource`` also supports glob patterns. + +- An ``orsource`` statement, which combines ``osource`` and ``rsource``. For example, the following statement will include :file:`Kconfig1` and :file:`Kconfig2` from the current directory (if they exist): .. code-block:: none - grsource "Kconfig[12]" + orsource "Kconfig[12]" Old Zephyr Kconfig behavior for defaults ======================================== diff --git a/drivers/i2s/Kconfig b/drivers/i2s/Kconfig index 18dd8b2d139..55748172bfc 100644 --- a/drivers/i2s/Kconfig +++ b/drivers/i2s/Kconfig @@ -37,6 +37,6 @@ config SYS_LOG_I2S_LEVEL comment "Device Drivers" -gsource "drivers/i2s/Kconfig.*" +source "drivers/i2s/Kconfig.*" endif # I2S