Shields: Allow shields conditional configuration

Kconfig.zephyr

@@ -17,9 +17,12 @@ endmenu
 # (e.g. the first default) with a satisfied condition.
 #
 # Board defaults should be parsed before SoC defaults, because boards usually
-# overrides SoC values.
+# overrides SoC values. Similarly shields defaults should be parsed before
+# boards defaults, because shields defaults override boards defaults.
 #
 # Note: $ARCH and $BOARD_DIR might be glob patterns.
+source "boards/shields/*/Kconfig.defconfig"
+
 source "$(BOARD_DIR)/Kconfig.defconfig"
 
 source "$(SOC_DIR)/$(ARCH)/*/Kconfig.defconfig"

boards/Kconfig

@@ -23,6 +23,9 @@ source "$(BOARD_DIR)/Kconfig.board"
 
 endchoice
 
+# Parse shields references
+# Don't do it as a menuconfig, as shield selection is a CMake feature.
+rsource "shields/*/Kconfig.shield"
 
 menu "Board Options"
 # There might not be any board options, hence the optional source

boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig

@@ -0,0 +1,35 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_ADAFRUIT_2_8_TFT_TOUCH_V2
+
+if DISPLAY
+
+config SPI
+	default y
+
+config ILI9340
+	default y
+
+if LVGL
+
+config LVGL_DISPLAY_DEV_NAME
+	default "ILI9340"
+
+config LVGL_HOR_RES
+	default 320
+
+config LVGL_VER_RES
+	default 240
+
+config LVGL_VDB_SIZE
+	default 64
+
+config LVGL_BITS_PER_PIXEL
+	default 24
+
+endif # LVGL
+
+endif # DISPLAY
+
+endif # SHIELD_ADAFRUIT_2_8_TFT_TOUCH_V2

boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.shield

@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_ADAFRUIT_2_8_TFT_TOUCH_V2
+	def_bool $(shields_list_contains,adafruit_2_8_tft_touch_v2)

boards/shields/dfrobot_can_bus_v2_0/Kconfig.defconfig

@@ -0,0 +1,18 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_DFROBOT_CAN_BUS_V2_0
+
+if CAN
+
+config SPI
+	default y
+
+config CAN_MCP2515
+	default y
+
+rsource "boards/*.defconfig"
+
+endif # CAN
+
+endif # SHIELD_DFROBOT_CAN_BUS_V2_0

boards/shields/dfrobot_can_bus_v2_0/Kconfig.shield

@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_DFROBOT_CAN_BUS_V2_0
+	def_bool $(shields_list_contains,dfrobot_can_bus_v2_0)

boards/shields/dfrobot_can_bus_v2_0/boards/nrf52_pca10040.defconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF52_PCA10040
+
+config CAN_1
+	default y
+
+endif # BOARD_NRF52_PCA10040

boards/shields/frdm_cr20a/Kconfig.defconfig

@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2019, NXP
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if SHIELD_FRDM_CR20A
+
+if IEEE802154
+
+config SPI
+	default y
+
+config IEEE802154_MCR20A
+	default y
+
+config NET_CONFIG_IEEE802154_DEV_NAME
+	default "mcr20a"
+
+rsource "boards/*.defconfig"
+
+endif # IEEE802154
+
+endif # SHIELD_FRDM_CR20A

boards/shields/frdm_cr20a/Kconfig.shield

@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_FRDM_CR20A
+	def_bool $(shields_list_contains,frdm_cr20a)

boards/shields/frdm_cr20a/boards/frdm_k64f.defconfig

@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2019, NXP
+# Copyright (c) 2019 Linaro Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if BOARD_FRDM_K64F
+
+config NET_L2_ETHERNET
+	default n
+
+endif # BOARD_FRDM_K64F

boards/shields/frdm_kw41z/Kconfig.shield

@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_FRDM_KW41Z
+	def_bool $(shields_list_contains,frdm_kw41z)

boards/shields/link_board_can/Kconfig.defconfig

@@ -0,0 +1,18 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_LINK_BOARD_CAN
+
+if NETWORKING
+
+config SPI
+	default y
+
+config CAN_MCP2515
+	default y
+
+rsource "boards/*.defconfig"
+
+endif # NETWORKING
+
+endif # SHIELD_LINK_BOARD_CAN

boards/shields/link_board_can/Kconfig.shield

@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_LINK_BOARD_CAN
+	def_bool $(shields_list_contains,link_board_can)

boards/shields/link_board_can/boards/reel_board.defconfig

@@ -0,0 +1,12 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_REEL_BOARD
+
+config SPI_1
+	default y
+
+config CAN_1
+	default y
+
+endif # BOARD_REEL_BOARD

boards/shields/link_board_eth/Kconfig.defconfig

@@ -0,0 +1,21 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_LINK_BOARD_ETH
+
+if NETWORKING
+
+config SPI
+	default y
+
+config NET_L2_ETHERNET
+	default y
+
+config ETH_ENC424J600
+	default y
+
+rsource "boards/*.defconfig"
+
+endif # NETWORKING
+
+endif # SHIELD_LINK_BOARD_ETH

boards/shields/link_board_eth/Kconfig.shield

@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_LINK_BOARD_ETH
+	def_bool $(shields_list_contains,link_board_eth)

boards/shields/link_board_eth/boards/reel_board.defconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_REEL_BOARD
+
+config ETH_ENC424J600_0_GPIO_SPI_CS
+	default y
+
+endif # BOARD_REEL_BOARD

boards/shields/sparkfun_sara_r4/Kconfig.defconfig

@@ -0,0 +1,39 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_SPARKFUN_SARA_R4
+
+if NETWORKING
+
+config MODEM
+	default y
+
+config MODEM_SHELL
+	default y
+
+config MODEM_UBLOX_SARA
+	default y
+
+choice MODEM_UBLOX_SARA_VARIANT
+	default MODEM_UBLOX_SARA_R4
+endchoice
+
+config UART_INTERRUPT_DRIVEN
+	default y
+
+# extend retry timing to 20 seconds for LTE/LTE-M
+config COAP_INIT_ACK_TIMEOUT_MS
+	default 20000
+
+# Hack: disable IPv6 for now
+config NET_IPV6
+	default n
+
+config NET_CONFIG_NEED_IPV6
+	default n
+
+rsource "boards/*.defconfig"
+
+endif # NETWORKING
+
+endif # SHIELD_SPARKFUN_SARA_R4

boards/shields/sparkfun_sara_r4/Kconfig.shield

@@ -0,0 +1,5 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_SPARKFUN_SARA_R4
+	def_bool $(shields_list_contains,sparkfun_sara_r4)

boards/shields/sparkfun_sara_r4/boards/frdm_k64f.defconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_FRDM_K64F
+
+config UART_MCUX_3
+	default y
+
+endif # BOARD_FRDM_K64F

boards/shields/sparkfun_sara_r4/boards/nrf52840_pca10056.defconfig

@@ -0,0 +1,12 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF52840_PCA10056
+
+config GPIO_NRF_P1
+	default y
+
+config UART_1_NRF_UARTE
+	default y
+
+endif # BOARD_NRF52840_PCA10056