From 5f5e9fb96806c0c6aba7206151153c272188a92d Mon Sep 17 00:00:00 2001 From: Adithya Baglody Date: Wed, 23 May 2018 16:52:20 +0530 Subject: [PATCH] drivers: flash: Remove usage of zephyr_library_ifdef Phasing out the usage of this cmake macro from the drivers/flash folder. Signed-off-by: Adithya Baglody --- drivers/CMakeLists.txt | 2 +- drivers/flash/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt index 92844b76d94..8cde167eb1a 100644 --- a/drivers/CMakeLists.txt +++ b/drivers/CMakeLists.txt @@ -9,7 +9,6 @@ add_subdirectory_if_kconfig(counter) add_subdirectory_if_kconfig(crypto) add_subdirectory_if_kconfig(display) add_subdirectory_if_kconfig(dma) -add_subdirectory_if_kconfig(flash) add_subdirectory_if_kconfig(gpio) add_subdirectory_if_kconfig(grove) add_subdirectory_if_kconfig(i2c) @@ -30,6 +29,7 @@ add_subdirectory_if_kconfig(watchdog) add_subdirectory_if_kconfig(wifi) add_subdirectory_if_kconfig(can) +add_subdirectory_ifdef(CONFIG_FLASH_HAS_DRIVER_ENABLED flash) add_subdirectory_ifdef(CONFIG_AIO_COMPARATOR aio) add_subdirectory_ifdef(CONFIG_BT bluetooth) add_subdirectory_ifdef(CONFIG_NETWORKING net) diff --git a/drivers/flash/CMakeLists.txt b/drivers/flash/CMakeLists.txt index 142fd32a32f..591c5442ef2 100644 --- a/drivers/flash/CMakeLists.txt +++ b/drivers/flash/CMakeLists.txt @@ -1,4 +1,4 @@ -zephyr_library_ifdef(CONFIG_FLASH_HAS_DRIVER_ENABLED) +zephyr_library() zephyr_library_sources_ifdef(CONFIG_SPI_FLASH_W25QXXDV spi_flash_w25qxxdv.c) zephyr_library_sources_ifdef(CONFIG_SOC_FLASH_QMSI soc_flash_qmsi.c)