From 244f826e3c7333bb92fb53a65c50ee5cbd8a2ea0 Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Fri, 31 Jul 2020 13:52:40 +0200 Subject: [PATCH] cmake: remove _if_kconfig() functions This set of functions seem to be there just because of historical reasons, stemming from Kbuild. They are non-obvious and prone to errors, so remove them in favor of the `_ifdef()` ones with an explicit `CONFIG_` condition. Script used: git grep -l _if_kconfig | xargs sed -E -i "s/_if_kconfig\(\s*(\w*)/_ifdef(CONFIG_\U\1\E \1/g" Signed-off-by: Carles Cufi --- arch/arc/core/CMakeLists.txt | 2 +- arch/arc/core/mpu/CMakeLists.txt | 4 +- arch/nios2/core/CMakeLists.txt | 2 +- arch/riscv/core/CMakeLists.txt | 2 +- arch/x86/core/CMakeLists.txt | 12 ++-- .../arm/cy8ckit_062_wifi_bt_m0/CMakeLists.txt | 2 +- .../arm/cy8ckit_062_wifi_bt_m4/CMakeLists.txt | 2 +- boards/arm/qemu_cortex_m0/CMakeLists.txt | 2 +- cmake/extensions.cmake | 39 +---------- doc/releases/release-notes-2.4.rst | 5 ++ drivers/CMakeLists.txt | 66 +++++++++---------- drivers/console/CMakeLists.txt | 24 +++---- drivers/ipm/CMakeLists.txt | 2 +- drivers/serial/CMakeLists.txt | 54 +++++++-------- drivers/timer/CMakeLists.txt | 28 ++++---- kernel/CMakeLists.txt | 4 +- lib/gui/CMakeLists.txt | 2 +- lib/os/CMakeLists.txt | 4 +- subsys/CMakeLists.txt | 2 +- subsys/canbus/CMakeLists.txt | 4 +- subsys/canbus/canopen/CMakeLists.txt | 2 +- subsys/canbus/isotp/CMakeLists.txt | 2 +- subsys/disk/CMakeLists.txt | 2 +- subsys/net/lib/CMakeLists.txt | 8 +-- subsys/net/lib/http/CMakeLists.txt | 6 +- subsys/net/lib/socks/CMakeLists.txt | 2 +- subsys/power/CMakeLists.txt | 2 +- subsys/stats/CMakeLists.txt | 2 +- subsys/testsuite/CMakeLists.txt | 2 +- 29 files changed, 129 insertions(+), 161 deletions(-) diff --git a/arch/arc/core/CMakeLists.txt b/arch/arc/core/CMakeLists.txt index 73d8c709d1a..e39d93ff250 100644 --- a/arch/arc/core/CMakeLists.txt +++ b/arch/arc/core/CMakeLists.txt @@ -22,7 +22,7 @@ zephyr_library_sources( zephyr_library_sources_ifdef(CONFIG_CACHE_FLUSHING cache.c) zephyr_library_sources_ifdef(CONFIG_ARC_FIRQ fast_irq.S) -zephyr_library_sources_if_kconfig(irq_offload.c) +zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c) zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.S) zephyr_library_sources_ifdef(CONFIG_ARC_CONNECT arc_connect.c) diff --git a/arch/arc/core/mpu/CMakeLists.txt b/arch/arc/core/mpu/CMakeLists.txt index a81e4ebdb2c..c3ec9a3f1a1 100644 --- a/arch/arc/core/mpu/CMakeLists.txt +++ b/arch/arc/core/mpu/CMakeLists.txt @@ -2,5 +2,5 @@ zephyr_library() -zephyr_library_sources_if_kconfig(arc_core_mpu.c) -zephyr_library_sources_if_kconfig(arc_mpu.c) +zephyr_library_sources_ifdef(CONFIG_ARC_CORE_MPU arc_core_mpu.c) +zephyr_library_sources_ifdef(CONFIG_ARC_MPU arc_mpu.c) diff --git a/arch/nios2/core/CMakeLists.txt b/arch/nios2/core/CMakeLists.txt index cfda508543e..e0ff7328cb5 100644 --- a/arch/nios2/core/CMakeLists.txt +++ b/arch/nios2/core/CMakeLists.txt @@ -15,4 +15,4 @@ zephyr_library_sources( crt0.S ) -zephyr_library_sources_if_kconfig(irq_offload.c) +zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c) diff --git a/arch/riscv/core/CMakeLists.txt b/arch/riscv/core/CMakeLists.txt index 653f2b4cf8a..70287b56aff 100644 --- a/arch/riscv/core/CMakeLists.txt +++ b/arch/riscv/core/CMakeLists.txt @@ -13,4 +13,4 @@ zephyr_library_sources( thread.c ) -zephyr_library_sources_if_kconfig(irq_offload.c) +zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c) diff --git a/arch/x86/core/CMakeLists.txt b/arch/x86/core/CMakeLists.txt index e05a2ed034b..87411a1c5ac 100644 --- a/arch/x86/core/CMakeLists.txt +++ b/arch/x86/core/CMakeLists.txt @@ -13,12 +13,12 @@ zephyr_library_sources(prep_c.c) zephyr_library_sources(fatal.c) zephyr_library_sources(spec_ctrl.c) -zephyr_library_sources_if_kconfig(pcie.c) -zephyr_library_sources_if_kconfig(reboot_rst_cnt.c) -zephyr_library_sources_if_kconfig(multiboot.c) -zephyr_library_sources_if_kconfig(acpi.c) -zephyr_library_sources_if_kconfig(x86_mmu.c) -zephyr_library_sources_if_kconfig(userspace.c) +zephyr_library_sources_ifdef(CONFIG_PCIE pcie.c) +zephyr_library_sources_ifdef(CONFIG_REBOOT_RST_CNT reboot_rst_cnt.c) +zephyr_library_sources_ifdef(CONFIG_MULTIBOOT multiboot.c) +zephyr_library_sources_ifdef(CONFIG_ACPI acpi.c) +zephyr_library_sources_ifdef(CONFIG_X86_MMU x86_mmu.c) +zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.c) zephyr_library_sources_ifdef(CONFIG_X86_VERY_EARLY_CONSOLE early_serial.c) diff --git a/boards/arm/cy8ckit_062_wifi_bt_m0/CMakeLists.txt b/boards/arm/cy8ckit_062_wifi_bt_m0/CMakeLists.txt index 5fedb5f3030..278a23e29ee 100644 --- a/boards/arm/cy8ckit_062_wifi_bt_m0/CMakeLists.txt +++ b/boards/arm/cy8ckit_062_wifi_bt_m0/CMakeLists.txt @@ -6,4 +6,4 @@ zephyr_library() zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) -zephyr_library_sources_if_kconfig(pinmux.c) +zephyr_library_sources_ifdef(CONFIG_PINMUX pinmux.c) diff --git a/boards/arm/cy8ckit_062_wifi_bt_m4/CMakeLists.txt b/boards/arm/cy8ckit_062_wifi_bt_m4/CMakeLists.txt index 5fedb5f3030..278a23e29ee 100644 --- a/boards/arm/cy8ckit_062_wifi_bt_m4/CMakeLists.txt +++ b/boards/arm/cy8ckit_062_wifi_bt_m4/CMakeLists.txt @@ -6,4 +6,4 @@ zephyr_library() zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) -zephyr_library_sources_if_kconfig(pinmux.c) +zephyr_library_sources_ifdef(CONFIG_PINMUX pinmux.c) diff --git a/boards/arm/qemu_cortex_m0/CMakeLists.txt b/boards/arm/qemu_cortex_m0/CMakeLists.txt index d5670359eda..3381afa71dc 100644 --- a/boards/arm/qemu_cortex_m0/CMakeLists.txt +++ b/boards/arm/qemu_cortex_m0/CMakeLists.txt @@ -4,4 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 # -zephyr_sources_if_kconfig( nrf_timer_timer.c) +zephyr_sources_ifdef(CONFIG_NRF_TIMER_TIMER nrf_timer_timer.c) diff --git a/cmake/extensions.cmake b/cmake/extensions.cmake index 51c6e86c837..94b597051eb 100644 --- a/cmake/extensions.cmake +++ b/cmake/extensions.cmake @@ -11,8 +11,7 @@ # 1.4. board_* # 1.5. Misc. # 2. Kconfig-aware extensions -# 2.1 *_if_kconfig -# 2.2 Misc +# 2.1 Misc # 3. CMake-generic extensions # 3.1. *_ifdef # 3.2. *_ifndef @@ -1020,42 +1019,8 @@ endfunction() # Kconfig is a configuration language developed for the Linux # kernel. The below functions integrate CMake with Kconfig. # -# 2.1 *_if_kconfig -# -# Functions for conditionally including directories and source files -# that have matching KConfig values. -# -# zephyr_library_sources_if_kconfig(fft.c) -# is the same as -# zephyr_library_sources_ifdef(CONFIG_FFT fft.c) -# -# add_subdirectory_if_kconfig(serial) -# is the same as -# add_subdirectory_ifdef(CONFIG_SERIAL serial) -function(add_subdirectory_if_kconfig dir) - string(TOUPPER config_${dir} UPPER_CASE_CONFIG) - add_subdirectory_ifdef(${UPPER_CASE_CONFIG} ${dir}) -endfunction() -function(target_sources_if_kconfig target scope item) - get_filename_component(item_basename ${item} NAME_WE) - string(TOUPPER CONFIG_${item_basename} UPPER_CASE_CONFIG) - target_sources_ifdef(${UPPER_CASE_CONFIG} ${target} ${scope} ${item}) -endfunction() - -function(zephyr_library_sources_if_kconfig item) - get_filename_component(item_basename ${item} NAME_WE) - string(TOUPPER CONFIG_${item_basename} UPPER_CASE_CONFIG) - zephyr_library_sources_ifdef(${UPPER_CASE_CONFIG} ${item}) -endfunction() - -function(zephyr_sources_if_kconfig item) - get_filename_component(item_basename ${item} NAME_WE) - string(TOUPPER CONFIG_${item_basename} UPPER_CASE_CONFIG) - zephyr_sources_ifdef(${UPPER_CASE_CONFIG} ${item}) -endfunction() - -# 2.2 Misc +# 2.1 Misc # # import_kconfig( []) # diff --git a/doc/releases/release-notes-2.4.rst b/doc/releases/release-notes-2.4.rst index eb2111326ff..e8372316850 100644 --- a/doc/releases/release-notes-2.4.rst +++ b/doc/releases/release-notes-2.4.rst @@ -85,6 +85,11 @@ Removed APIs in this release :ref:`util_api`. Use ``FOR_EACH`` instead. * The CONFIG_NET_IF_USERSPACE_ACCESS is removed as it is no longer needed. +* Build system + + * The set of ``*_if_kconfig()`` CMake functions have been removed. Use + ``_ifdef(CONFIG_ ...)`` instead. + Stable API changes in this release ================================== diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt index 53fadf71774..d409fabd45a 100644 --- a/drivers/CMakeLists.txt +++ b/drivers/CMakeLists.txt @@ -6,40 +6,38 @@ add_subdirectory(console) add_subdirectory(interrupt_controller) add_subdirectory(pcie) -add_subdirectory_if_kconfig(adc) -add_subdirectory_if_kconfig(clock_control) -add_subdirectory_if_kconfig(counter) -add_subdirectory_if_kconfig(crypto) -add_subdirectory_if_kconfig(dac) -add_subdirectory_if_kconfig(display) -add_subdirectory_if_kconfig(dma) -add_subdirectory_if_kconfig(gpio) -add_subdirectory_if_kconfig(grove) -add_subdirectory_if_kconfig(i2c) -add_subdirectory_if_kconfig(i2s) -add_subdirectory_if_kconfig(ieee802154) -add_subdirectory_if_kconfig(ipm) -add_subdirectory_if_kconfig(led) -add_subdirectory_if_kconfig(led_strip) -add_subdirectory_if_kconfig(modem) -add_subdirectory_if_kconfig(pinmux) -add_subdirectory_if_kconfig(pwm) -add_subdirectory_if_kconfig(rtc) -add_subdirectory_if_kconfig(sensor) -add_subdirectory_if_kconfig(spi) -add_subdirectory_if_kconfig(usb) -add_subdirectory_if_kconfig(watchdog) -add_subdirectory_if_kconfig(wifi) -add_subdirectory_if_kconfig(can) -add_subdirectory_if_kconfig(audio) -add_subdirectory_if_kconfig(hwinfo) -add_subdirectory_if_kconfig(espi) -add_subdirectory_if_kconfig(ps2) -add_subdirectory_if_kconfig(kscan) -add_subdirectory_if_kconfig(video) -add_subdirectory_if_kconfig(eeprom) -add_subdirectory_if_kconfig(lora) -add_subdirectory_if_kconfig(peci) +add_subdirectory_ifdef(CONFIG_ADC adc) +add_subdirectory_ifdef(CONFIG_CLOCK_CONTROL clock_control) +add_subdirectory_ifdef(CONFIG_COUNTER counter) +add_subdirectory_ifdef(CONFIG_CRYPTO crypto) +add_subdirectory_ifdef(CONFIG_DAC dac) +add_subdirectory_ifdef(CONFIG_DISPLAY display) +add_subdirectory_ifdef(CONFIG_DMA dma) +add_subdirectory_ifdef(CONFIG_GPIO gpio) +add_subdirectory_ifdef(CONFIG_I2C i2c) +add_subdirectory_ifdef(CONFIG_I2S i2s) +add_subdirectory_ifdef(CONFIG_IEEE802154 ieee802154) +add_subdirectory_ifdef(CONFIG_IPM ipm) +add_subdirectory_ifdef(CONFIG_LED led) +add_subdirectory_ifdef(CONFIG_LED_STRIP led_strip) +add_subdirectory_ifdef(CONFIG_MODEM modem) +add_subdirectory_ifdef(CONFIG_PINMUX pinmux) +add_subdirectory_ifdef(CONFIG_PWM pwm) +add_subdirectory_ifdef(CONFIG_SENSOR sensor) +add_subdirectory_ifdef(CONFIG_SPI spi) +add_subdirectory_ifdef(CONFIG_USB usb) +add_subdirectory_ifdef(CONFIG_WATCHDOG watchdog) +add_subdirectory_ifdef(CONFIG_WIFI wifi) +add_subdirectory_ifdef(CONFIG_CAN can) +add_subdirectory_ifdef(CONFIG_AUDIO audio) +add_subdirectory_ifdef(CONFIG_HWINFO hwinfo) +add_subdirectory_ifdef(CONFIG_ESPI espi) +add_subdirectory_ifdef(CONFIG_PS2 ps2) +add_subdirectory_ifdef(CONFIG_KSCAN kscan) +add_subdirectory_ifdef(CONFIG_VIDEO video) +add_subdirectory_ifdef(CONFIG_EEPROM eeprom) +add_subdirectory_ifdef(CONFIG_LORA lora) +add_subdirectory_ifdef(CONFIG_PECI peci) add_subdirectory_ifdef(CONFIG_FLASH_HAS_DRIVER_ENABLED flash) add_subdirectory_ifdef(CONFIG_SERIAL_HAS_DRIVER serial) diff --git a/drivers/console/CMakeLists.txt b/drivers/console/CMakeLists.txt index ddb56527c12..46b6eb53fdb 100644 --- a/drivers/console/CMakeLists.txt +++ b/drivers/console/CMakeLists.txt @@ -1,14 +1,14 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_sources_if_kconfig(uart_console.c) -zephyr_sources_if_kconfig(ram_console.c) -zephyr_sources_if_kconfig(rtt_console.c) -zephyr_sources_if_kconfig(ipm_console_receiver.c) -zephyr_sources_if_kconfig(ipm_console_sender.c) -zephyr_sources_if_kconfig(uart_mcumgr.c) -zephyr_sources_if_kconfig(uart_pipe.c) -zephyr_sources_if_kconfig(xtensa_sim_console.c) -zephyr_sources_if_kconfig(native_posix_console.c) -zephyr_sources_if_kconfig(uart_mux.c) -zephyr_sources_if_kconfig(gsm_mux.c) -zephyr_sources_if_kconfig(semihost_console.c) +zephyr_sources_ifdef(CONFIG_UART_CONSOLE uart_console.c) +zephyr_sources_ifdef(CONFIG_RAM_CONSOLE ram_console.c) +zephyr_sources_ifdef(CONFIG_RTT_CONSOLE rtt_console.c) +zephyr_sources_ifdef(CONFIG_IPM_CONSOLE_RECEIVER ipm_console_receiver.c) +zephyr_sources_ifdef(CONFIG_IPM_CONSOLE_SENDER ipm_console_sender.c) +zephyr_sources_ifdef(CONFIG_UART_MCUMGR uart_mcumgr.c) +zephyr_sources_ifdef(CONFIG_UART_PIPE uart_pipe.c) +zephyr_sources_ifdef(CONFIG_XTENSA_SIM_CONSOLE xtensa_sim_console.c) +zephyr_sources_ifdef(CONFIG_NATIVE_POSIX_CONSOLE native_posix_console.c) +zephyr_sources_ifdef(CONFIG_UART_MUX uart_mux.c) +zephyr_sources_ifdef(CONFIG_GSM_MUX gsm_mux.c) +zephyr_sources_ifdef(CONFIG_SEMIHOST_CONSOLE semihost_console.c) diff --git a/drivers/ipm/CMakeLists.txt b/drivers/ipm/CMakeLists.txt index 1007903d347..312163cab1d 100644 --- a/drivers/ipm/CMakeLists.txt +++ b/drivers/ipm/CMakeLists.txt @@ -8,6 +8,6 @@ zephyr_library_sources_ifdef(CONFIG_IPM_MHU ipm_mhu.c) zephyr_library_sources_ifdef(CONFIG_IPM_STM32_IPCC ipm_stm32_ipcc.c) zephyr_library_sources_ifdef(CONFIG_IPM_NRFX ipm_nrfx_ipc.c) -zephyr_library_sources_if_kconfig(ipm_cavs_idc.c) +zephyr_library_sources_ifdef(CONFIG_IPM_CAVS_IDC ipm_cavs_idc.c) zephyr_library_sources_ifdef(CONFIG_USERSPACE ipm_handlers.c) diff --git a/drivers/serial/CMakeLists.txt b/drivers/serial/CMakeLists.txt index 0612d92920f..057ec62aae4 100644 --- a/drivers/serial/CMakeLists.txt +++ b/drivers/serial/CMakeLists.txt @@ -2,36 +2,36 @@ zephyr_library() zephyr_library_sources_ifdef(CONFIG_UART_ALTERA_JTAG uart_altera_jtag_hal.c) -zephyr_library_sources_if_kconfig(uart_imx.c) -zephyr_library_sources_if_kconfig(uart_cc13xx_cc26xx.c) -zephyr_library_sources_if_kconfig(uart_cc32xx.c) -zephyr_library_sources_if_kconfig(uart_cmsdk_apb.c) -zephyr_library_sources_if_kconfig(uart_esp32.c) -zephyr_library_sources_if_kconfig(uart_sifive.c) -zephyr_library_sources_if_kconfig(uart_gecko.c) -zephyr_library_sources_if_kconfig(leuart_gecko.c) -zephyr_library_sources_if_kconfig(uart_lpc11u6x.c) -zephyr_library_sources_if_kconfig(uart_mcux.c) -zephyr_library_sources_if_kconfig(uart_mcux_flexcomm.c) -zephyr_library_sources_if_kconfig(uart_mcux_lpuart.c) -zephyr_library_sources_if_kconfig(uart_mcux_lpsci.c) -zephyr_library_sources_if_kconfig(uart_miv.c) -zephyr_library_sources_if_kconfig(uart_msp432p4xx.c) +zephyr_library_sources_ifdef(CONFIG_UART_IMX uart_imx.c) +zephyr_library_sources_ifdef(CONFIG_UART_CC13XX_CC26XX uart_cc13xx_cc26xx.c) +zephyr_library_sources_ifdef(CONFIG_UART_CC32XX uart_cc32xx.c) +zephyr_library_sources_ifdef(CONFIG_UART_CMSDK_APB uart_cmsdk_apb.c) +zephyr_library_sources_ifdef(CONFIG_UART_ESP32 uart_esp32.c) +zephyr_library_sources_ifdef(CONFIG_UART_SIFIVE uart_sifive.c) +zephyr_library_sources_ifdef(CONFIG_UART_GECKO uart_gecko.c) +zephyr_library_sources_ifdef(CONFIG_LEUART_GECKO leuart_gecko.c) +zephyr_library_sources_ifdef(CONFIG_UART_LPC11U6X uart_lpc11u6x.c) +zephyr_library_sources_ifdef(CONFIG_UART_MCUX uart_mcux.c) +zephyr_library_sources_ifdef(CONFIG_UART_MCUX_FLEXCOMM uart_mcux_flexcomm.c) +zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPUART uart_mcux_lpuart.c) +zephyr_library_sources_ifdef(CONFIG_UART_MCUX_LPSCI uart_mcux_lpsci.c) +zephyr_library_sources_ifdef(CONFIG_UART_MIV uart_miv.c) +zephyr_library_sources_ifdef(CONFIG_UART_MSP432P4XX uart_msp432p4xx.c) zephyr_library_sources_ifdef(CONFIG_NRF_UART_PERIPHERAL uart_nrfx_uart.c) zephyr_library_sources_ifdef(CONFIG_NRF_UARTE_PERIPHERAL uart_nrfx_uarte.c) -zephyr_library_sources_if_kconfig(uart_nuvoton.c) -zephyr_library_sources_if_kconfig(uart_sam.c) -zephyr_library_sources_if_kconfig(usart_sam.c) -zephyr_library_sources_if_kconfig(uart_stellaris.c) -zephyr_library_sources_if_kconfig(uart_stm32.c) -zephyr_library_sources_if_kconfig(uart_sam0.c) -zephyr_library_sources_if_kconfig(uart_psoc6.c) -zephyr_library_sources_if_kconfig(uart_pl011.c) -zephyr_library_sources_if_kconfig(uart_rv32m1_lpuart.c) -zephyr_library_sources_if_kconfig(uart_liteuart.c) +zephyr_library_sources_ifdef(CONFIG_UART_NUVOTON uart_nuvoton.c) +zephyr_library_sources_ifdef(CONFIG_UART_SAM uart_sam.c) +zephyr_library_sources_ifdef(CONFIG_USART_SAM usart_sam.c) +zephyr_library_sources_ifdef(CONFIG_UART_STELLARIS uart_stellaris.c) +zephyr_library_sources_ifdef(CONFIG_UART_STM32 uart_stm32.c) +zephyr_library_sources_ifdef(CONFIG_UART_SAM0 uart_sam0.c) +zephyr_library_sources_ifdef(CONFIG_UART_PSOC6 uart_psoc6.c) +zephyr_library_sources_ifdef(CONFIG_UART_PL011 uart_pl011.c) +zephyr_library_sources_ifdef(CONFIG_UART_RV32M1_LPUART uart_rv32m1_lpuart.c) +zephyr_library_sources_ifdef(CONFIG_UART_LITEUART uart_liteuart.c) zephyr_library_sources_ifdef(CONFIG_UART_RTT_DRIVER uart_rtt.c) -zephyr_library_sources_if_kconfig(uart_xlnx_ps.c) -zephyr_library_sources_if_kconfig(uart_xmc4xxx.c) +zephyr_library_sources_ifdef(CONFIG_UART_XLNX_PS uart_xlnx_ps.c) +zephyr_library_sources_ifdef(CONFIG_UART_XMC4XXX uart_xmc4xxx.c) zephyr_library_sources_ifdef(CONFIG_USERSPACE uart_handlers.c) diff --git a/drivers/timer/CMakeLists.txt b/drivers/timer/CMakeLists.txt index 38d2ad2bca2..e8fa835125e 100644 --- a/drivers/timer/CMakeLists.txt +++ b/drivers/timer/CMakeLists.txt @@ -4,19 +4,19 @@ zephyr_sources( sys_clock_init.c) zephyr_sources_ifdef(CONFIG_HPET_TIMER hpet.c) zephyr_sources_ifdef(CONFIG_ARCV2_TIMER arcv2_timer0.c) zephyr_sources_ifdef(CONFIG_ARM_ARCH_TIMER arm_arch_timer.c) -zephyr_sources_if_kconfig( loapic_timer.c) -zephyr_sources_if_kconfig( apic_timer.c) +zephyr_sources_ifdef(CONFIG_LOAPIC_TIMER loapic_timer.c) +zephyr_sources_ifdef(CONFIG_APIC_TIMER apic_timer.c) zephyr_sources_ifdef(CONFIG_ALTERA_AVALON_TIMER altera_avalon_timer_hal.c) -zephyr_sources_if_kconfig( nrf_rtc_timer.c) -zephyr_sources_if_kconfig( stm32_lptim_timer.c) -zephyr_sources_if_kconfig( riscv_machine_timer.c) -zephyr_sources_if_kconfig( rv32m1_lptmr_timer.c) -zephyr_sources_if_kconfig( cortex_m_systick.c) +zephyr_sources_ifdef(CONFIG_NRF_RTC_TIMER nrf_rtc_timer.c) +zephyr_sources_ifdef(CONFIG_STM32_LPTIM_TIMER stm32_lptim_timer.c) +zephyr_sources_ifdef(CONFIG_RISCV_MACHINE_TIMER riscv_machine_timer.c) +zephyr_sources_ifdef(CONFIG_RV32M1_LPTMR_TIMER rv32m1_lptmr_timer.c) +zephyr_sources_ifdef(CONFIG_CORTEX_M_SYSTICK cortex_m_systick.c) zephyr_sources_ifdef(CONFIG_XTENSA_TIMER xtensa_sys_timer.c) -zephyr_sources_if_kconfig( native_posix_timer.c) -zephyr_sources_if_kconfig( sam0_rtc_timer.c) -zephyr_sources_if_kconfig( litex_timer.c) -zephyr_sources_if_kconfig( mchp_xec_rtos_timer.c) -zephyr_sources_if_kconfig( xlnx_psttc_timer.c) -zephyr_sources_if_kconfig( cc13x2_cc26x2_rtc_timer.c) -zephyr_sources_if_kconfig( cavs_timer.c) +zephyr_sources_ifdef(CONFIG_NATIVE_POSIX_TIMER native_posix_timer.c) +zephyr_sources_ifdef(CONFIG_SAM0_RTC_TIMER sam0_rtc_timer.c) +zephyr_sources_ifdef(CONFIG_LITEX_TIMER litex_timer.c) +zephyr_sources_ifdef(CONFIG_MCHP_XEC_RTOS_TIMER mchp_xec_rtos_timer.c) +zephyr_sources_ifdef(CONFIG_XLNX_PSTTC_TIMER xlnx_psttc_timer.c) +zephyr_sources_ifdef(CONFIG_CC13X2_CC26X2_RTC_TIMER cc13x2_cc26x2_rtc_timer.c) +zephyr_sources_ifdef(CONFIG_CAVS_TIMER cavs_timer.c) diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index 3d47fb4dff5..0396c500b69 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -39,8 +39,8 @@ set_target_properties( target_sources_ifdef(CONFIG_STACK_CANARIES kernel PRIVATE compiler_stack_protect.c) target_sources_ifdef(CONFIG_SYS_CLOCK_EXISTS kernel PRIVATE timeout.c timer.c) target_sources_ifdef(CONFIG_ATOMIC_OPERATIONS_C kernel PRIVATE atomic_c.c) -target_sources_if_kconfig( kernel PRIVATE mmu.c) -target_sources_if_kconfig( kernel PRIVATE poll.c) +target_sources_ifdef(CONFIG_MMU kernel PRIVATE mmu.c) +target_sources_ifdef(CONFIG_POLL kernel PRIVATE poll.c) if(${CONFIG_MEM_POOL_HEAP_BACKEND}) else() diff --git a/lib/gui/CMakeLists.txt b/lib/gui/CMakeLists.txt index 42bf3755800..190450bd13f 100644 --- a/lib/gui/CMakeLists.txt +++ b/lib/gui/CMakeLists.txt @@ -1,3 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 -add_subdirectory_if_kconfig(lvgl) +add_subdirectory_ifdef(CONFIG_LVGL lvgl) diff --git a/lib/os/CMakeLists.txt b/lib/os/CMakeLists.txt index 8e52ad59543..8b3cd1bbdfc 100644 --- a/lib/os/CMakeLists.txt +++ b/lib/os/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_sources_if_kconfig(base64.c) +zephyr_sources_ifdef(CONFIG_BASE64 base64.c) zephyr_sources( crc32_sw.c @@ -25,7 +25,7 @@ zephyr_sources( zephyr_sources_ifdef(CONFIG_JSON_LIBRARY json.c) -zephyr_sources_if_kconfig(ring_buffer.c) +zephyr_sources_ifdef(CONFIG_RING_BUFFER ring_buffer.c) zephyr_sources_ifdef(CONFIG_ASSERT assert.c) diff --git a/subsys/CMakeLists.txt b/subsys/CMakeLists.txt index 4efb319e96a..d335d2d0809 100644 --- a/subsys/CMakeLists.txt +++ b/subsys/CMakeLists.txt @@ -20,5 +20,5 @@ add_subdirectory(power) add_subdirectory(stats) add_subdirectory(testsuite) add_subdirectory(tracing) -add_subdirectory_if_kconfig(jwt) +add_subdirectory_ifdef(CONFIG_JWT jwt) add_subdirectory(canbus) diff --git a/subsys/canbus/CMakeLists.txt b/subsys/canbus/CMakeLists.txt index bf827ab546a..c88cf12bd4e 100644 --- a/subsys/canbus/CMakeLists.txt +++ b/subsys/canbus/CMakeLists.txt @@ -1,4 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 -add_subdirectory_if_kconfig(canopen) -add_subdirectory_if_kconfig(isotp) +add_subdirectory_ifdef(CONFIG_CANOPEN canopen) +add_subdirectory_ifdef(CONFIG_ISOTP isotp) diff --git a/subsys/canbus/canopen/CMakeLists.txt b/subsys/canbus/canopen/CMakeLists.txt index 55811fc2414..f43e7bd9af9 100644 --- a/subsys/canbus/canopen/CMakeLists.txt +++ b/subsys/canbus/canopen/CMakeLists.txt @@ -4,6 +4,6 @@ zephyr_library() zephyr_library_sources_ifdef(CONFIG_CANOPEN CO_driver.c) zephyr_library_sources_ifdef(CONFIG_CANOPEN_SYNC_THREAD canopen_sync.c) zephyr_library_sources_ifdef(CONFIG_CANOPEN_STORAGE canopen_storage.c) -zephyr_library_sources_if_kconfig(canopen_leds.c) +zephyr_library_sources_ifdef(CONFIG_CANOPEN_LEDS canopen_leds.c) zephyr_library_sources_ifdef(CONFIG_CANOPEN_PROGRAM_DOWNLOAD canopen_program.c) zephyr_include_directories(.) diff --git a/subsys/canbus/isotp/CMakeLists.txt b/subsys/canbus/isotp/CMakeLists.txt index 4f6e0266ceb..f15e6aa76a9 100644 --- a/subsys/canbus/isotp/CMakeLists.txt +++ b/subsys/canbus/isotp/CMakeLists.txt @@ -1,4 +1,4 @@ # SPDX-License-Identifier: Apache-2.0 zephyr_library() -zephyr_library_sources_if_kconfig(isotp.c) +zephyr_library_sources_ifdef(CONFIG_ISOTP isotp.c) diff --git a/subsys/disk/CMakeLists.txt b/subsys/disk/CMakeLists.txt index 412ce9ec1dd..f0ac7462564 100644 --- a/subsys/disk/CMakeLists.txt +++ b/subsys/disk/CMakeLists.txt @@ -4,5 +4,5 @@ zephyr_sources_ifdef(CONFIG_DISK_ACCESS disk_access.c) zephyr_sources_ifdef(CONFIG_DISK_ACCESS_FLASH disk_access_flash.c) zephyr_sources_ifdef(CONFIG_DISK_ACCESS_RAM disk_access_ram.c) zephyr_sources_ifdef(CONFIG_DISK_ACCESS_SPI_SDHC disk_access_spi_sdhc.c) -zephyr_sources_if_kconfig(disk_access_stm32_sdmmc.c) +zephyr_sources_ifdef(CONFIG_DISK_ACCESS_STM32_SDMMC disk_access_stm32_sdmmc.c) zephyr_sources_ifdef(CONFIG_DISK_ACCESS_USDHC disk_access_usdhc.c) diff --git a/subsys/net/lib/CMakeLists.txt b/subsys/net/lib/CMakeLists.txt index 22fb7423e88..eb986f1d9a1 100644 --- a/subsys/net/lib/CMakeLists.txt +++ b/subsys/net/lib/CMakeLists.txt @@ -1,10 +1,10 @@ # SPDX-License-Identifier: Apache-2.0 add_subdirectory(utils) -add_subdirectory_if_kconfig(coap) -add_subdirectory_if_kconfig(lwm2m) -add_subdirectory_if_kconfig(socks) -add_subdirectory_if_kconfig(sntp) +add_subdirectory_ifdef(CONFIG_COAP coap) +add_subdirectory_ifdef(CONFIG_LWM2M lwm2m) +add_subdirectory_ifdef(CONFIG_SOCKS socks) +add_subdirectory_ifdef(CONFIG_SNTP sntp) add_subdirectory_ifdef(CONFIG_MQTT_LIB mqtt) add_subdirectory_ifdef(CONFIG_TFTP_LIB tftp) add_subdirectory_ifdef(CONFIG_NET_CONFIG_SETTINGS config) diff --git a/subsys/net/lib/http/CMakeLists.txt b/subsys/net/lib/http/CMakeLists.txt index 7a2255db704..5d9d4a06a32 100644 --- a/subsys/net/lib/http/CMakeLists.txt +++ b/subsys/net/lib/http/CMakeLists.txt @@ -8,6 +8,6 @@ endif() zephyr_include_directories(${ZEPHYR_BASE}/subsys/net/ip) -zephyr_library_sources_if_kconfig(http_parser.c) -zephyr_library_sources_if_kconfig(http_parser_url.c) -zephyr_library_sources_if_kconfig(http_client.c) +zephyr_library_sources_ifdef(CONFIG_HTTP_PARSER http_parser.c) +zephyr_library_sources_ifdef(CONFIG_HTTP_PARSER_URL http_parser_url.c) +zephyr_library_sources_ifdef(CONFIG_HTTP_CLIENT http_client.c) diff --git a/subsys/net/lib/socks/CMakeLists.txt b/subsys/net/lib/socks/CMakeLists.txt index 17bcd08964c..0cfddd2d374 100644 --- a/subsys/net/lib/socks/CMakeLists.txt +++ b/subsys/net/lib/socks/CMakeLists.txt @@ -2,4 +2,4 @@ zephyr_library() -zephyr_library_sources_if_kconfig(socks.c) +zephyr_library_sources_ifdef(CONFIG_SOCKS socks.c) diff --git a/subsys/power/CMakeLists.txt b/subsys/power/CMakeLists.txt index 86cd632ef9c..7a3ea948d88 100644 --- a/subsys/power/CMakeLists.txt +++ b/subsys/power/CMakeLists.txt @@ -4,5 +4,5 @@ zephyr_sources_ifdef(CONFIG_SYS_POWER_MANAGEMENT power.c) zephyr_sources_ifdef(CONFIG_DEVICE_POWER_MANAGEMENT device.c) zephyr_sources_ifdef(CONFIG_SYS_PM_STATE_LOCK pm_ctrl.c) zephyr_sources_ifdef(CONFIG_DEVICE_IDLE_PM device_pm.c) -zephyr_sources_if_kconfig(reboot.c) +zephyr_sources_ifdef(CONFIG_REBOOT reboot.c) add_subdirectory(policy) diff --git a/subsys/stats/CMakeLists.txt b/subsys/stats/CMakeLists.txt index c3d6623a7f4..ddaa4c2e138 100644 --- a/subsys/stats/CMakeLists.txt +++ b/subsys/stats/CMakeLists.txt @@ -1,3 +1,3 @@ # SPDX-License-Identifier: Apache-2.0 -zephyr_sources_if_kconfig(stats.c) +zephyr_sources_ifdef(CONFIG_STATS stats.c) diff --git a/subsys/testsuite/CMakeLists.txt b/subsys/testsuite/CMakeLists.txt index 86a04a0d5e3..cae4009df17 100644 --- a/subsys/testsuite/CMakeLists.txt +++ b/subsys/testsuite/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -add_subdirectory_if_kconfig(ztest) +add_subdirectory_ifdef(CONFIG_ZTEST ztest) zephyr_include_directories_ifdef(CONFIG_TEST ${ZEPHYR_BASE}/subsys/testsuite/include