Commit 244f826e authored by Carles Cufi's avatar Carles Cufi
Browse files

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: default avatarCarles Cufi <carles.cufi@nordicsemi.no>
parent dc48999e

arch/arc/core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/arc/core/mpu/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/nios2/core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/riscv/core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/x86/core/CMakeLists.txt

+6 −6
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE