kconfig: Search replace source "*" with gsource "*"

This is an RFC for changing the Kconfig dialect that Zephyr is using. Zephyr has copied and modified the Linux kernel's configuration language into it's own tree. One modification that Zephyr has done is changed the semantics of the 'source' keyword. Instead of the 'source' argument being treated as a path it is treated as a glob pattern[0]. This is a backwards-incompatible change with the kernel's configuration language, not just an extention of what 'source' accepts. Meaning, running our Kconfig processor on the Linux kernel's sources can produce different results. Specifically, if there is a typo in the 'source' path the linux kernel will trigger an error, but in Zephyr this is silently treated as a pattern that had no matches. Also, when glob special characters are used the two languages will match on different source files. The Linux kernel's literal 'source' keyword is not present in Zephyr, but it is useful, and often desired behaviour. E.g. the intended and expected behaviour of: source "Kconfig.zophyr" would be to trigger an error due to a typo in the file name. But in the Zephyr dialect this is treated as a valid glob pattern that happened to not have any matches. Another issue with changing the semantics of 'source' is that Kconfig code and Kconfig infrastructure can no longer be re-used between the Linux kernel and Zephyr as they are working with different languages. To resolve these issues this RFC proposes to revert 'source' back to the original Linux kernel semantics and introduce the 'gsource' keyword to cover the use-case of wildcard matches. In this solution the linux kernel's language will be a subset of the Zephyr language and if a user wanted to he could write portable Kconfig if he limited himself to this subset. Script to reword wildcard matches to 'gsource': https://gist.github.com/SebastianBoe/8d36b5b1af0491e5abc8fd598ded976c RFC to introduce 'gsource': ulfalizer/Kconfiglib#40 [0] https://en.wikipedia.org/wiki/Glob_(programming) Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
SebastianBoe · Mar 14, 2018 · a98817e · a98817e
1 parent e553674
commit a98817e
Show file tree

Hide file tree

Showing 64 changed files with 73 additions and 73 deletions.
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
@@ -43,5 +43,5 @@ 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"
+gsource "arch/$ENV_VAR_SYM_ARCH/soc/*/Kconfig.defconfig"
 source "$ENV_VAR_SYM_BOARD_DIR/Kconfig.defconfig"
diff --git 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
 
 
@@ -267,6 +267,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
@@ -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 "Board 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_nrf5/Kconfig b/arch/arm/soc/nordic_nrf5/Kconfig
@@ -16,4 +16,4 @@ config SOC_FAMILY
 	default nordic_nrf5
 endif
 
-source "arch/arm/soc/nordic_nrf5/*/Kconfig.soc"
+gsource "arch/arm/soc/nordic_nrf5/*/Kconfig.soc"
diff --git a/arch/arm/soc/nordic_nrf5/Kconfig.defconfig b/arch/arm/soc/nordic_nrf5/Kconfig.defconfig
@@ -31,6 +31,6 @@ config SOC_FLASH_NRF5
 
 endif # FLASH
 
-source "arch/arm/soc/nordic_nrf5/*/Kconfig.defconfig.series"
+gsource "arch/arm/soc/nordic_nrf5/*/Kconfig.defconfig.series"
 
 endif # SOC_FAMILY_NRF5
diff --git a/arch/arm/soc/nordic_nrf5/Kconfig.soc b/arch/arm/soc/nordic_nrf5/Kconfig.soc
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-source "arch/arm/soc/nordic_nrf5/*/Kconfig.series"
+gsource "arch/arm/soc/nordic_nrf5/*/Kconfig.series"
 
diff --git a/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.series b/arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.series
@@ -7,7 +7,7 @@
 
 if SOC_SERIES_NRF51X
 
-source "arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51*"
+gsource "arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51*"
 
 config SOC_SERIES
 	default nrf51

diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series
@@ -7,7 +7,7 @@
 
 if SOC_SERIES_NRF52X
 
-source "arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52*"
+gsource "arch/arm/soc/nordic_nrf5/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
@@ -15,7 +15,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
@@ -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
@@ -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
@@ -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
@@ -16,7 +16,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -28,4 +28,4 @@ config STM32_ARM_MPU_ENABLE
 	help
 	  Enable MPU
 
-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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