diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 2b5406888fc..aab92bdfbb1 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -43,5 +43,8 @@ source "tests/Kconfig" # Board defaults should be parsed after SoC defaults # because board usually overrides SoC values. # -source "arch/$ENV_VAR_SYM_ARCH/soc/*/Kconfig.defconfig" -source "$ENV_VAR_SYM_BOARD_DIR/Kconfig.defconfig" + +# $ENV_VAR_SYM_ARCH and $ENV_VAR_SYM_BOARD_DIR might be glob patterns + +gsource "arch/$ENV_VAR_SYM_ARCH/soc/*/Kconfig.defconfig" +gsource "$ENV_VAR_SYM_BOARD_DIR/Kconfig.defconfig" diff --git a/arch/Kconfig b/arch/Kconfig index 823c28481f1..f68aa3f8407 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -326,6 +326,7 @@ config BOARD arch//soc// -source "arch/$ENV_VAR_SYM_ARCH/Kconfig" +# $ENV_VAR_SYM_ARCH might be a glob pattern +gsource "arch/$ENV_VAR_SYM_ARCH/Kconfig" source "boards/Kconfig" diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 92df391f2fa..3e3b7664a6b 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -10,7 +10,7 @@ choice prompt "ARC SoC Selection" depends on ARC - source "arch/arc/soc/*/Kconfig.soc" + gsource "arch/arc/soc/*/Kconfig.soc" endchoice @@ -209,6 +209,6 @@ config CACHE_FLUSHING endmenu -source "arch/arc/soc/*/Kconfig" +gsource "arch/arc/soc/*/Kconfig" endmenu diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dc912eac323..a702f55420b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -11,7 +11,7 @@ choice default SOC_SERIES_KINETIS_K6X depends on ARM - source "arch/arm/soc/*/Kconfig.soc" + gsource "arch/arm/soc/*/Kconfig.soc" endchoice menu "ARM Options" @@ -29,7 +29,7 @@ source "arch/arm/core/Kconfig" menu "SoC Configuration" -source "arch/arm/soc/*/Kconfig" +gsource "arch/arm/soc/*/Kconfig" endmenu endmenu diff --git a/arch/arm/soc/arm/Kconfig b/arch/arm/soc/arm/Kconfig index 77cb98d51a5..917c988d18e 100644 --- a/arch/arm/soc/arm/Kconfig +++ b/arch/arm/soc/arm/Kconfig @@ -16,4 +16,4 @@ config SOC_FAMILY default arm endif -source "arch/arm/soc/arm/*/Kconfig.soc" +gsource "arch/arm/soc/arm/*/Kconfig.soc" diff --git a/arch/arm/soc/arm/Kconfig.defconfig b/arch/arm/soc/arm/Kconfig.defconfig index 765ebbcb42c..752a0d7b498 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 # -source "arch/arm/soc/arm/*/Kconfig.defconfig.series" +gsource "arch/arm/soc/arm/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/arm/Kconfig.soc b/arch/arm/soc/arm/Kconfig.soc index 649d83501d5..b298d3a46d7 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 # -source "arch/arm/soc/arm/*/Kconfig.series" +gsource "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 735594c7ae9..1bbcac11e71 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 -source "arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle*" +gsource "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 8a0e3536bfe..7148ccc8abd 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 -source "arch/arm/soc/arm/mps2/Kconfig.defconfig.mps2*" +gsource "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 db8c340cb06..eb28eec254b 100644 --- a/arch/arm/soc/atmel_sam/Kconfig +++ b/arch/arm/soc/atmel_sam/Kconfig @@ -17,4 +17,4 @@ config SOC_FAMILY endif #SOC_FAMILY_SAM # Select SoC Part No. and configuration options -source "arch/arm/soc/atmel_sam/*/Kconfig.soc" +gsource "arch/arm/soc/atmel_sam/*/Kconfig.soc" diff --git a/arch/arm/soc/atmel_sam/Kconfig.defconfig b/arch/arm/soc/atmel_sam/Kconfig.defconfig index 0c28ed6890d..cb282dbc49c 100644 --- a/arch/arm/soc/atmel_sam/Kconfig.defconfig +++ b/arch/arm/soc/atmel_sam/Kconfig.defconfig @@ -10,4 +10,4 @@ config WATCHDOG def_bool y endif -source "arch/arm/soc/atmel_sam/*/Kconfig.defconfig.series" +gsource "arch/arm/soc/atmel_sam/*/Kconfig.defconfig.series" diff --git a/arch/arm/soc/atmel_sam/Kconfig.soc b/arch/arm/soc/atmel_sam/Kconfig.soc index c98fb93e9b7..584525cd171 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 # -source "arch/arm/soc/atmel_sam/*/Kconfig.series" +gsource "arch/arm/soc/atmel_sam/*/Kconfig.series" diff --git a/arch/arm/soc/atmel_sam0/Kconfig b/arch/arm/soc/atmel_sam0/Kconfig index 8a74f1bcb80..f21c19b50f2 100644 --- a/arch/arm/soc/atmel_sam0/Kconfig +++ b/arch/arm/soc/atmel_sam0/Kconfig @@ -15,4 +15,4 @@ config SOC_FAMILY endif -source "arch/arm/soc/atmel_sam0/*/Kconfig.soc" +gsource "arch/arm/soc/atmel_sam0/*/Kconfig.soc" diff --git a/arch/arm/soc/atmel_sam0/Kconfig.defconfig b/arch/arm/soc/atmel_sam0/Kconfig.defconfig index e9d2a6c54f5..4599d33641e 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 -source "arch/arm/soc/atmel_sam0/*/Kconfig.defconfig.series" +gsource "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 9ef04d42555..e38b6d5381a 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 -source "arch/arm/soc/atmel_sam0/*/Kconfig.series" +gsource "arch/arm/soc/atmel_sam0/*/Kconfig.series" diff --git a/arch/arm/soc/nordic_nrf/Kconfig b/arch/arm/soc/nordic_nrf/Kconfig index 5501127df0a..c8b25a34281 100644 --- a/arch/arm/soc/nordic_nrf/Kconfig +++ b/arch/arm/soc/nordic_nrf/Kconfig @@ -16,4 +16,4 @@ config SOC_FAMILY default nordic_nrf endif -source "arch/arm/soc/nordic_nrf/*/Kconfig.soc" +gsource "arch/arm/soc/nordic_nrf/*/Kconfig.soc" diff --git a/arch/arm/soc/nordic_nrf/Kconfig.defconfig b/arch/arm/soc/nordic_nrf/Kconfig.defconfig index 6dac2d52558..95d30ffb861 100644 --- a/arch/arm/soc/nordic_nrf/Kconfig.defconfig +++ b/arch/arm/soc/nordic_nrf/Kconfig.defconfig @@ -31,6 +31,6 @@ config SOC_FLASH_NRF endif # FLASH -source "arch/arm/soc/nordic_nrf/*/Kconfig.defconfig.series" +gsource "arch/arm/soc/nordic_nrf/*/Kconfig.defconfig.series" endif # SOC_FAMILY_NRF diff --git a/arch/arm/soc/nordic_nrf/Kconfig.soc b/arch/arm/soc/nordic_nrf/Kconfig.soc index f9c59a31a8b..67a97be4c77 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 # -source "arch/arm/soc/nordic_nrf/*/Kconfig.series" +gsource "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 afb76537b74..dce18086b0f 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 -source "arch/arm/soc/nordic_nrf/nrf51/Kconfig.defconfig.nrf51*" +gsource "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 a494563b4dd..e64188e668a 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 -source "arch/arm/soc/nordic_nrf/nrf52/Kconfig.defconfig.nrf52*" +gsource "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 726e2e1c163..ce7bdece83e 100644 --- a/arch/arm/soc/nxp_imx/Kconfig +++ b/arch/arm/soc/nxp_imx/Kconfig @@ -16,7 +16,7 @@ config SOC_FAMILY default "nxp_imx" endif -source "arch/arm/soc/nxp_imx/*/Kconfig.soc" +gsource "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 2baa0d2099e..838492b8db9 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 # -source "arch/arm/soc/nxp_imx/*/Kconfig.defconfig.series" +gsource "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 0b399381d1f..d19530729ca 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 # -source "arch/arm/soc/nxp_imx/*/Kconfig.series" +gsource "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 143102c75cb..226efa9c4be 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 -source "arch/arm/soc/nxp_imx/rt/Kconfig.defconfig.mimxrt*" +gsource "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 ff2a32e893f..03d78209c57 100644 --- a/arch/arm/soc/nxp_kinetis/Kconfig +++ b/arch/arm/soc/nxp_kinetis/Kconfig @@ -17,7 +17,7 @@ config SOC_FAMILY default "nxp_kinetis" endif -source "arch/arm/soc/nxp_kinetis/*/Kconfig.soc" +gsource "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 7ceb7a560b6..56949c90107 100644 --- a/arch/arm/soc/nxp_kinetis/Kconfig.defconfig +++ b/arch/arm/soc/nxp_kinetis/Kconfig.defconfig @@ -1 +1 @@ -source "arch/arm/soc/nxp_kinetis/*/Kconfig.defconfig.series" +gsource "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 31cadb6126b..822df007dda 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 # -source "arch/arm/soc/nxp_kinetis/*/Kconfig.series" +gsource "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 d2992c95af0..508f969be44 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 -source "arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk*" +gsource "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 c594854fd28..e3b6ca4a39e 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 -source "arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mk*" +gsource "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 faf128e5053..591d248aeac 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 -source "arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mk*" +gsource "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 639153a8fc2..5244139de58 100644 --- a/arch/arm/soc/nxp_lpc/Kconfig +++ b/arch/arm/soc/nxp_lpc/Kconfig @@ -16,7 +16,7 @@ config SOC_FAMILY default "nxp_lpc" endif -source "arch/arm/soc/nxp_lpc/*/Kconfig.soc" +gsource "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 3a8e4a1d068..a5c8eb98bd7 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 # -source "arch/arm/soc/nxp_lpc/*/Kconfig.defconfig.series" +gsource "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 5e2b5e861af..f38ae1c3922 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 # -source "arch/arm/soc/nxp_lpc/*/Kconfig.series" +gsource "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 8453abdd0d4..fe8095c803b 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 -source "arch/arm/soc/nxp_lpc/lpc54xxx/Kconfig.defconfig.lp*" +gsource "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 d1e17ecb121..fa0319a2254 100644 --- a/arch/arm/soc/silabs_exx32/Kconfig +++ b/arch/arm/soc/silabs_exx32/Kconfig @@ -15,7 +15,7 @@ config SOC_FAMILY default "silabs_exx32" endif -source "arch/arm/soc/silabs_exx32/*/Kconfig.soc" +gsource "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 129445c29c7..51c242aa5f3 100644 --- a/arch/arm/soc/silabs_exx32/Kconfig.defconfig +++ b/arch/arm/soc/silabs_exx32/Kconfig.defconfig @@ -1 +1 @@ -source "arch/arm/soc/silabs_exx32/*/Kconfig.defconfig.series" +gsource "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 dc332fdb10b..7cacbe0ac3b 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 # -source "arch/arm/soc/silabs_exx32/*/Kconfig.series" +gsource "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 fe18fe6d81f..0e1177bf765 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 -source "arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.e*" +gsource "arch/arm/soc/silabs_exx32/efm32wg/Kconfig.defconfig.e*" endif # SOC_SERIES_EFM32WG diff --git a/arch/arm/soc/st_stm32/Kconfig b/arch/arm/soc/st_stm32/Kconfig index 3e9a0d1fcf6..8b752d8dc0a 100644 --- a/arch/arm/soc/st_stm32/Kconfig +++ b/arch/arm/soc/st_stm32/Kconfig @@ -30,4 +30,4 @@ config STM32_ARM_MPU_ENABLE help Enable MPU support on STM32 SoCs -source "arch/arm/soc/st_stm32/*/Kconfig.soc" +gsource "arch/arm/soc/st_stm32/*/Kconfig.soc" diff --git a/arch/arm/soc/st_stm32/Kconfig.defconfig b/arch/arm/soc/st_stm32/Kconfig.defconfig index cd94a36ca59..8bb2d76889d 100644 --- a/arch/arm/soc/st_stm32/Kconfig.defconfig +++ b/arch/arm/soc/st_stm32/Kconfig.defconfig @@ -1 +1 @@ -source "arch/arm/soc/st_stm32/*/Kconfig.defconfig.series" +gsource "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 5f2c10840fc..bffe8d10941 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 # -source "arch/arm/soc/st_stm32/*/Kconfig.series" +gsource "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 ec5caefd9a3..5ea604d049b 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 -source "arch/arm/soc/st_stm32/stm32f0/Kconfig.defconfig.stm32f0*" +gsource "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 b9c13a309f4..6f1812a1f75 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 -source "arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f1*" +gsource "arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f1*" config SOC_SERIES default stm32f1 diff --git a/arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.series index 207b37890a5..6b604049772 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 -source "arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.stm32f3*" +gsource "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 8dd552afdfd..d4d30290c6b 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 -source "arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f4*" +gsource "arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f4*" config SOC_SERIES default stm32f4 diff --git a/arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.series b/arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.series index a5470613c61..de3bd510685 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 -source "arch/arm/soc/st_stm32/stm32l0/Kconfig.defconfig.stm32l0*" +gsource "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 b10005df94a..7f624482566 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 -source "arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l4*" +gsource "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 8247b7190b0..3e45b7405d5 100644 --- a/arch/arm/soc/ti_simplelink/Kconfig +++ b/arch/arm/soc/ti_simplelink/Kconfig @@ -12,4 +12,4 @@ config SOC_FAMILY default ti_simplelink endif -source "arch/arm/soc/ti_simplelink/*/Kconfig.soc" +gsource "arch/arm/soc/ti_simplelink/*/Kconfig.soc" diff --git a/arch/arm/soc/ti_simplelink/Kconfig.defconfig b/arch/arm/soc/ti_simplelink/Kconfig.defconfig index 98f6ef6dcf9..30ddf2a6100 100644 --- a/arch/arm/soc/ti_simplelink/Kconfig.defconfig +++ b/arch/arm/soc/ti_simplelink/Kconfig.defconfig @@ -1 +1 @@ -source "arch/arm/soc/ti_simplelink/*/Kconfig.defconfig.series" +gsource "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 d17c7ca69f3..47b66fc7c5c 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 # -source "arch/arm/soc/ti_simplelink/*/Kconfig.series" +gsource "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 d5a5ca1799d..0f081377eab 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 -source "arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc32*" +gsource "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 d893dfdfa57..7a2bfce4dbf 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 -source "arch/arm/soc/ti_simplelink/msp432p4xx/Kconfig.defconfig.msp432p4*" +gsource "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 bf52afda860..b28e1e55039 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -7,7 +7,7 @@ choice prompt "Nios II configuration selection" depends on NIOS2 - source "arch/nios2/soc/*/Kconfig.soc" + gsource "arch/nios2/soc/*/Kconfig.soc" endchoice menu "Nios II Options" @@ -113,6 +113,6 @@ endchoice endmenu -source "arch/nios2/soc/*/Kconfig" +gsource "arch/nios2/soc/*/Kconfig" endmenu diff --git a/arch/posix/Kconfig b/arch/posix/Kconfig index 71a017ef73e..733f01a0520 100644 --- a/arch/posix/Kconfig +++ b/arch/posix/Kconfig @@ -10,7 +10,7 @@ choice prompt "POSIX Configuration Selection" depends on ARCH_POSIX - source "arch/posix/soc/*/Kconfig.soc" + gsource "arch/posix/soc/*/Kconfig.soc" endchoice menu "POSIX (native) Options" @@ -34,6 +34,6 @@ config ARCH_POSIX_RECOMMENDED_STACK_SIZE thread stack, the real stack is the native underlying pthread stack. Therefore the allocated stack can be limited to this size) -source "arch/posix/soc/*/Kconfig" +gsource "arch/posix/soc/*/Kconfig" endmenu diff --git a/arch/riscv32/Kconfig b/arch/riscv32/Kconfig index 62d64afa1f7..d698b463050 100644 --- a/arch/riscv32/Kconfig +++ b/arch/riscv32/Kconfig @@ -7,7 +7,7 @@ choice prompt "RISCV32 configuration selection" depends on RISCV32 - source "arch/riscv32/soc/*/Kconfig.soc" + gsource "arch/riscv32/soc/*/Kconfig.soc" endchoice menu "RISCV32 Options" @@ -65,6 +65,6 @@ config GEN_IRQ_VECTOR_TABLE endmenu -source "arch/riscv32/soc/*/Kconfig" +gsource "arch/riscv32/soc/*/Kconfig" endmenu diff --git a/arch/riscv32/soc/riscv-privilege/Kconfig b/arch/riscv32/soc/riscv-privilege/Kconfig index 7eda5002897..9ba6d127adf 100644 --- a/arch/riscv32/soc/riscv-privilege/Kconfig +++ b/arch/riscv32/soc/riscv-privilege/Kconfig @@ -24,4 +24,4 @@ config RISCV_HAS_PLIC Does the SOC provide support for a Platform Level Interrupt Controller -source "arch/riscv32/soc/riscv-privilege/*/Kconfig.soc" +gsource "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 365b72a7a58..4732f8d850d 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 # -source "arch/riscv32/soc/riscv-privilege/*/Kconfig.defconfig.series" +gsource "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 12ee3fed8b4..0c2f90098db 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 # -source "arch/riscv32/soc/riscv-privilege/*/Kconfig.series" +gsource "arch/riscv32/soc/riscv-privilege/*/Kconfig.series" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 02a475acf20..b995cc1366e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -10,7 +10,7 @@ choice prompt "x86 SoC Selection" depends on X86 - source "arch/x86/soc/*/Kconfig.soc" + gsource "arch/x86/soc/*/Kconfig.soc" endchoice menu "X86 Architecture Options" @@ -312,6 +312,6 @@ config X86_FIXED_IRQ_MAPPING endmenu -source "arch/x86/soc/*/Kconfig" +gsource "arch/x86/soc/*/Kconfig" endmenu diff --git a/arch/x86/soc/intel_quark/Kconfig b/arch/x86/soc/intel_quark/Kconfig index 140ee6fbb3f..604e0fa055f 100644 --- a/arch/x86/soc/intel_quark/Kconfig +++ b/arch/x86/soc/intel_quark/Kconfig @@ -14,6 +14,6 @@ config SOC_FAMILY default "intel_quark" endif -source "arch/x86/soc/intel_quark/*/Kconfig.soc" +gsource "arch/x86/soc/intel_quark/*/Kconfig.soc" -source "arch/x86/soc/intel_quark/*/Kconfig" +gsource "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 2908606825c..b4a4d3f46a8 100644 --- a/arch/x86/soc/intel_quark/Kconfig.defconfig +++ b/arch/x86/soc/intel_quark/Kconfig.defconfig @@ -1 +1 @@ -source "arch/x86/soc/intel_quark/*/Kconfig.defconfig.series" +gsource "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 de93ceb83ce..a9a57c8581f 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 # -source "arch/x86/soc/intel_quark/*/Kconfig.series" +gsource "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 198cad8ec70..70e681e606a 100644 --- a/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series +++ b/arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.series @@ -246,7 +246,7 @@ config USB_DW_IRQ_PRI default 3 endif # USB -source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se*" -source "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.curie*" +gsource "arch/x86/soc/intel_quark/quark_se/Kconfig.defconfig.quark_se*" +gsource "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 aff94c1c4c3..c87763afd8c 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -6,7 +6,7 @@ choice prompt "XTENSA core Selection" depends on XTENSA - source "arch/xtensa/soc/*/Kconfig.soc" + gsource "arch/xtensa/soc/*/Kconfig.soc" endchoice menu "XTENSA Options" @@ -109,7 +109,7 @@ config TOOLCHAIN_VARIANT string default RG-2016.4-linux -source "arch/xtensa/soc/*/Kconfig" +gsource "arch/xtensa/soc/*/Kconfig" endmenu diff --git a/boards/Kconfig b/boards/Kconfig index e4391da7262..3c5c0a45151 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -14,12 +14,14 @@ config QEMU_TARGET Mark all QEMU targets with this variable for checking whether we are running in an emulated environment. +# $ENV_VAR_SYM_BOARD_DIR might be a glob pattern + choice prompt "Board Selection" -source "$ENV_VAR_SYM_BOARD_DIR/Kconfig.board" +gsource "$ENV_VAR_SYM_BOARD_DIR/Kconfig.board" endchoice menu "Board Options" -source "$ENV_VAR_SYM_BOARD_DIR/Kconfig" +gsource "$ENV_VAR_SYM_BOARD_DIR/Kconfig" endmenu diff --git a/drivers/i2s/Kconfig b/drivers/i2s/Kconfig index cd419666f20..7f652c11c97 100644 --- a/drivers/i2s/Kconfig +++ b/drivers/i2s/Kconfig @@ -38,6 +38,6 @@ config SYS_LOG_I2S_LEVEL comment "Device Drivers" -source "drivers/i2s/Kconfig.*" +gsource "drivers/i2s/Kconfig.*" endif # I2S diff --git a/scripts/kconfig/kconfiglib.py b/scripts/kconfig/kconfiglib.py index b4650c93a5a..57b5bc77661 100644 --- a/scripts/kconfig/kconfiglib.py +++ b/scripts/kconfig/kconfiglib.py @@ -1941,7 +1941,6 @@ class Kconfig(object): prev.next = prev = node elif t0 == _T_SOURCE: - assert False # T_SOURCE is not in use in Zephyr for now. self._enter_file(self._expand_syms(self._expect_str_and_eol())) prev = self._parse_block(None, parent, prev, visible_if_deps) self._leave_file() @@ -4998,7 +4997,7 @@ _get_keyword = { "range": _T_RANGE, "rsource": _T_RSOURCE, "select": _T_SELECT, - "source": _T_GSOURCE, # Have 'source' behave like 'gsource' for now + "source": _T_SOURCE, "string": _T_STRING, "tristate": _T_TRISTATE, "visible": _T_VISIBLE,