diff --git a/boards/shields/dfrobot_can_bus_v2_0/Kconfig.defconfig b/boards/shields/dfrobot_can_bus_v2_0/Kconfig.defconfig index 0dbee6c0bb9..8b020b722a9 100644 --- a/boards/shields/dfrobot_can_bus_v2_0/Kconfig.defconfig +++ b/boards/shields/dfrobot_can_bus_v2_0/Kconfig.defconfig @@ -11,8 +11,6 @@ config SPI config CAN_MCP2515 default y -rsource "boards/*.defconfig" - endif # CAN endif # SHIELD_DFROBOT_CAN_BUS_V2_0 diff --git a/boards/shields/dfrobot_can_bus_v2_0/boards/nrf52dk_nrf52832.defconfig b/boards/shields/dfrobot_can_bus_v2_0/boards/nrf52dk_nrf52832.defconfig deleted file mode 100644 index 384bf2015b7..00000000000 --- a/boards/shields/dfrobot_can_bus_v2_0/boards/nrf52dk_nrf52832.defconfig +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2019 Linaro Limited -# SPDX-License-Identifier: Apache-2.0 - -config CAN_1 - default y - depends on BOARD_NRF52DK_NRF52832 diff --git a/drivers/can/can_mcp2515.c b/drivers/can/can_mcp2515.c index 381d7671611..a0652dc86fe 100644 --- a/drivers/can/can_mcp2515.c +++ b/drivers/can/can_mcp2515.c @@ -826,7 +826,7 @@ static int mcp2515_init(struct device *dev) return ret; } -#ifdef CONFIG_CAN_1 +#if DT_HAS_DRV_INST(0) static K_THREAD_STACK_DEFINE(mcp2515_int_thread_stack, CONFIG_CAN_MCP2515_INT_THREAD_STACK_SIZE); @@ -864,4 +864,4 @@ DEVICE_AND_API_INIT(can_mcp2515_1, DT_INST_LABEL(0), &mcp2515_init, &mcp2515_data_1, &mcp2515_config_1, POST_KERNEL, CONFIG_CAN_MCP2515_INIT_PRIORITY, &can_api_funcs); -#endif /* CONFIG_CAN_1 */ +#endif /* DT_HAS_DRV_INST(0) */