diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 42df354ba3..bbe168ca2b 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -18,8 +18,6 @@ # Note: $ARCH and $BOARD_DIR might be glob patterns. source "$(BOARD_DIR)/Kconfig.defconfig" -source "boards/shields/*/Kconfig.defconfig" - source "$(SOC_DIR)/$(ARCH)/*/Kconfig.defconfig" source "boards/Kconfig" diff --git a/boards/Kconfig b/boards/Kconfig index c15de0d180..8c9c71feba 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -25,7 +25,3 @@ menu "Board Options" # There might not be any board options, hence the optional source osource "$(BOARD_DIR)/Kconfig" endmenu - -menu "Shields" -source "boards/shields/*/Kconfig.shield" -endmenu diff --git a/boards/shields/frdm_kw41z/Kconfig.shield b/boards/shields/frdm_kw41z/Kconfig.shield deleted file mode 100644 index 73676f5c3a..0000000000 --- a/boards/shields/frdm_kw41z/Kconfig.shield +++ /dev/null @@ -1,8 +0,0 @@ -# -# Copyright (c) 2018, NXP -# -# SPDX-License-Identifier: Apache-2.0 -# - -config SHIELD_FRDM_KW41Z - bool "frdm_kw41z" diff --git a/boards/shields/x_nucleo_iks01a1/Kconfig.defconfig b/boards/shields/x_nucleo_iks01a1/Kconfig.defconfig deleted file mode 100644 index 91c51ff484..0000000000 --- a/boards/shields/x_nucleo_iks01a1/Kconfig.defconfig +++ /dev/null @@ -1,33 +0,0 @@ -# Kconfig - ST Nucleo Expansion Board x-nucleo-iks01a1 configuration -# -# Copyright (c) 2018 Linaro Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# - -if SHIELD_X_NUCLEO_IKS01A1 - -if HTS221 - -choice HTS221_TRIGGER_MODE - default HTS221_TRIGGER_NONE -endchoice - -endif # HTS221 - -if LIS3MDL - -choice LIS3MDL_TRIGGER_MODE - default LIS3MDL_TRIGGER_NONE -endchoice - -endif # LIS3MDL - -if I2C_STM32 - -config I2C_STM32_INTERRUPT - default y - -endif # I2C_STM32 - -endif # SHIELD_X_NUCLEO_IKS01A1 diff --git a/boards/shields/x_nucleo_iks01a1/Kconfig.shield b/boards/shields/x_nucleo_iks01a1/Kconfig.shield deleted file mode 100644 index 6f317e3e06..0000000000 --- a/boards/shields/x_nucleo_iks01a1/Kconfig.shield +++ /dev/null @@ -1,15 +0,0 @@ -# Kconfig - ST Nucleo Expansion Board x-nucleo-iks01a1 configuration -# -# Copyright (c) 2018 Linaro Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# - -config SHIELD_X_NUCLEO_IKS01A1 - bool "x-nucleo-iks01a1" - select I2C - select SENSOR - select HTS221 - select LPS25HB - select LSM6DS0 - select LIS3MDL diff --git a/boards/shields/x_nucleo_iks01a2/Kconfig.defconfig b/boards/shields/x_nucleo_iks01a2/Kconfig.defconfig deleted file mode 100644 index 8971ead899..0000000000 --- a/boards/shields/x_nucleo_iks01a2/Kconfig.defconfig +++ /dev/null @@ -1,25 +0,0 @@ -# Kconfig - ST Nucleo Expansion Board x-nucleo-iks01a2 configuration -# -# Copyright (c) 2018 Linaro Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# - -if SHIELD_X_NUCLEO_IKS01A2 - -if HTS221 - -choice HTS221_TRIGGER_MODE - default HTS221_TRIGGER_NONE -endchoice - -endif # HTS221 - -if I2C_STM32 - -config I2C_STM32_INTERRUPT - default y - -endif # I2C_STM32 - -endif # SHIELD_X_NUCLEO_IKS01A2 diff --git a/boards/shields/x_nucleo_iks01a2/Kconfig.shield b/boards/shields/x_nucleo_iks01a2/Kconfig.shield deleted file mode 100644 index 524ab03e23..0000000000 --- a/boards/shields/x_nucleo_iks01a2/Kconfig.shield +++ /dev/null @@ -1,14 +0,0 @@ -# Kconfig - ST Nucleo Expansion Board x-nucleo-iks01a2 configuration -# -# Copyright (c) 2018 Linaro Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# - -config SHIELD_X_NUCLEO_IKS01A2 - bool "x-nucleo-iks01a2" - select I2C - select SENSOR - select HTS221 - select LPS22HB - select LSM6DSL