Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions arch/arm/core/cortex_m/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ if(CONFIG_NULL_POINTER_EXCEPTION_DETECTION_DWT)
endif()

if(CONFIG_CORTEX_M_DWT)
if(CONFIG_TIMING_FUNCTIONS)
zephyr_library_sources(timing.c)
endif()
if(CONFIG_TIMING_FUNCTIONS)
zephyr_library_sources(timing.c)
endif()
endif()

if(CONFIG_SW_VECTOR_RELAY)
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#

if(CONFIG_BIG_ENDIAN)
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-bigmips")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-bigmips")
else()
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-littlemips")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-littlemips")
endif()

add_subdirectory(core)
Expand Down
14 changes: 7 additions & 7 deletions arch/posix/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
zephyr_library()
zephyr_library_compile_definitions(NO_POSIX_CHEATS)
zephyr_library_sources(
cpuhalt.c
fatal.c
irq.c
swap.c
thread.c
)
cpuhalt.c
fatal.c
irq.c
swap.c
thread.c
)

if(CONFIG_ARCH_POSIX_TRAP_ON_FATAL)
target_sources(native_simulator INTERFACE fatal_trap.c)
endif()

zephyr_library_sources(
posix_core_nsi.c
posix_core_nsi.c
)
12 changes: 6 additions & 6 deletions boards/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

if(EXISTS ${BOARD_DIR}/CMakeLists.txt)
if(USING_OUT_OF_TREE_BOARD)
set(build_dir boards/${ARCH}/${BOARD})
set(build_dir boards/${ARCH}/${BOARD})
else()
unset(build_dir)
unset(build_dir)

# FIXME: SHADOW_VARS: Remove this once we have enabled -Wshadow globally.
#
# For now, only enable warning for shadow variables for in-tree boards.
add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>)
# FIXME: SHADOW_VARS: Remove this once we have enabled -Wshadow globally.
#
# For now, only enable warning for shadow variables for in-tree boards.
add_compile_options($<TARGET_PROPERTY:compiler,warning_shadow_variables>)
endif()

add_subdirectory(${BOARD_DIR} ${build_dir})
Expand Down
2 changes: 1 addition & 1 deletion boards/adafruit/metro_rp2350/board.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0

if("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
endif()

board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
Expand Down
12 changes: 6 additions & 6 deletions boards/amd/versal2_rpu/board.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ set(QEMU_ARCH xilinx-aarch64)
set(QEMU_CPU_TYPE_${ARCH} cortex-r52)

set(QEMU_FLAGS_${ARCH}
-machine arm-generic-fdt
-hw-dtb ${PROJECT_BINARY_DIR}/${BOARD}-qemu.dtb
-device loader,addr=0xEB5E0310,data=0x2,data-len=4
-nographic
-m 2g
-machine arm-generic-fdt
-hw-dtb ${PROJECT_BINARY_DIR}/${BOARD}-qemu.dtb
-device loader,addr=0xEB5E0310,data=0x2,data-len=4
-nographic
-m 2g
)

set(QEMU_KERNEL_OPTION
-device loader,cpu-num=8,file=\$<TARGET_FILE:\${logical_target_for_zephyr_elf}>
-device loader,cpu-num=8,file=\$<TARGET_FILE:\${logical_target_for_zephyr_elf}>
)
13 changes: 7 additions & 6 deletions boards/amd/versalnet_apu/board.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ set(QEMU_ARCH xilinx-aarch64)
set(QEMU_CPU_TYPE_${ARCH} cortexa78)

set(QEMU_FLAGS_${ARCH}
-machine arm-generic-fdt
-hw-dtb ${PROJECT_BINARY_DIR}/${BOARD}-qemu.dtb
-device loader,addr=0xEC200300,data=0x3EE,data-len=4 -device loader,addr=0xEC200300,data=0x3DD,data-len=4
-nographic
-m 2g
-machine arm-generic-fdt
-hw-dtb ${PROJECT_BINARY_DIR}/${BOARD}-qemu.dtb
-device loader,addr=0xEC200300,data=0x3EE,data-len=4
-device loader,addr=0xEC200300,data=0x3DD,data-len=4
-nographic
-m 2g
)

set(QEMU_KERNEL_OPTION
-device loader,cpu-num=0,file=\$<TARGET_FILE:\${logical_target_for_zephyr_elf}>
-device loader,cpu-num=0,file=\$<TARGET_FILE:\${logical_target_for_zephyr_elf}>
)
2 changes: 1 addition & 1 deletion boards/kws/pico2_spe/board.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0

if("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
endif()

board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
Expand Down
2 changes: 1 addition & 1 deletion boards/kws/pico_spe/board.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# in the openocd interface configuration file.
# The setting is store to CMakeCache.txt.
if("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
endif()

board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
Expand Down
4 changes: 2 additions & 2 deletions boards/native/common/extra_args/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0

if(CONFIG_NATIVE_EXTRA_CMDLINE_ARGS)
zephyr_library()
zephyr_library_sources(extra_args.c)
zephyr_library()
zephyr_library_sources(extra_args.c)
endif()
16 changes: 8 additions & 8 deletions boards/native/native_sim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ zephyr_library()
zephyr_library_compile_definitions(NO_POSIX_CHEATS)

zephyr_library_sources(
cmdline.c
cpu_wait.c
nsi_if.c
irq_handler.c
misc.c
posix_arch_if.c
)
cmdline.c
cpu_wait.c
nsi_if.c
irq_handler.c
misc.c
posix_arch_if.c
)

if(CONFIG_NATIVE_SIM_REBOOT)
zephyr_library_sources(reboot.c)
Expand All @@ -33,7 +33,7 @@ if(CONFIG_HAS_SDL)
endif()

add_subdirectory(${ZEPHYR_BASE}/boards/native/common/extra_args/
${CMAKE_CURRENT_BINARY_DIR}/extra_args
${CMAKE_CURRENT_BINARY_DIR}/extra_args
)

set(nsi_config_content
Expand Down
48 changes: 24 additions & 24 deletions boards/native/nrf_bsim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ find_package(BabbleSim)
zephyr_library()

if(CONFIG_BOARD_NRF54L15BSIM_NRF54L15_CPUFLPR)
message(FATAL_ERROR "Targeting the nrf54l15bsim/nrf54l15/cpuflpr core is not yet supported")
message(FATAL_ERROR "Targeting the nrf54l15bsim/nrf54l15/cpuflpr core is not yet supported")
endif()

# Due to the BLE controller assumption about enum size
Expand All @@ -20,15 +20,15 @@ zephyr_compile_options(
target_compile_options(native_simulator INTERFACE -fshort-enums)

zephyr_library_sources(
irq_handler.c
cpu_wait.c
argparse.c
nsi_if.c
native_remap.c
soc/nrfx_coredep.c
common/bstests_entry.c
common/cmsis/cmsis.c
common/trace_hook.c
irq_handler.c
cpu_wait.c
argparse.c
nsi_if.c
native_remap.c
soc/nrfx_coredep.c
common/bstests_entry.c
common/cmsis/cmsis.c
common/trace_hook.c
)

# Include sync_rtc from real SOC code if enabled
Expand All @@ -37,18 +37,18 @@ zephyr_library_sources_ifdef(CONFIG_NRF53_SYNC_RTC
)

target_sources(native_simulator INTERFACE
common/bsim_args_runner.c
common/bsim_extra_cpu_if_stubs.c
common/phy_sync_ctrl.c
common/runner_hooks.c
common/posix_arch_if.c
common/trace_hook.c
common/bsim_args_runner.c
common/bsim_extra_cpu_if_stubs.c
common/phy_sync_ctrl.c
common/runner_hooks.c
common/posix_arch_if.c
common/trace_hook.c
)

if(CONFIG_IPC_SERVICE AND CONFIG_BOARD_NRF5340BSIM_NRF5340_CPUAPP)
zephyr_library_sources(
ipc_backend.c
)
zephyr_library_sources(
ipc_backend.c
)
endif()

zephyr_include_directories(
Expand All @@ -70,17 +70,17 @@ zephyr_library_include_directories(

set(libpath ${BSIM_OUT_PATH}/lib)
set_property(TARGET native_simulator APPEND PROPERTY RUNNER_LINK_LIBRARIES
${libpath}/libUtilv1.32.a
${libpath}/libPhyComv1.32.a
${libpath}/lib2G4PhyComv1.32.a
${libpath}/libRandv2.32.a
${libpath}/libUtilv1.32.a
${libpath}/libPhyComv1.32.a
${libpath}/lib2G4PhyComv1.32.a
${libpath}/libRandv2.32.a
)

target_compile_options(native_simulator INTERFACE
"-DNSI_PRIMARY_MCU_N=${CONFIG_NATIVE_SIMULATOR_PRIMARY_MCU_INDEX}")

add_subdirectory(${ZEPHYR_BASE}/boards/native/common/extra_args/
${CMAKE_CURRENT_BINARY_DIR}/extra_args
${CMAKE_CURRENT_BINARY_DIR}/extra_args
)

include(../common/natsim_config.cmake)
6 changes: 3 additions & 3 deletions boards/nxp/frdm_rw612/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ if(CONFIG_NXP_RW6XX_BOOT_HEADER)
endif()

if(CONFIG_DT_HAS_NXP_ENET_MAC_ENABLED AND ${xtal32_status})
message(FATAL_ERROR "Ethernet and external 32K clock source are "
"mutually exclusive on FRDM_RW612 due to shared PCB nets "
"between the ethernet PHY and the external oscillator")
message(FATAL_ERROR "Ethernet and external 32K clock source are "
"mutually exclusive on FRDM_RW612 due to shared PCB nets "
"between the ethernet PHY and the external oscillator")
endif()

# Set TX power limit file to override the default one
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1010_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ zephyr_library_sources(init.c)
if(CONFIG_NXP_IMXRT_BOOT_HEADER)
if(NOT DEFINED CONFIG_BOARD_MIMXRT1010_EVK)
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1010-EVK, but targeting a custom board. You may need to "
"update your flash configuration data blocks")
"the MIMXRT1010-EVK, but targeting a custom board. You may need to "
"update your flash configuration data blocks")
endif()
if(CONFIG_BOOT_FLEXSPI_NOR)
# This flash configuration block may need modification if another
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1015_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
zephyr_library()
if(NOT DEFINED CONFIG_BOARD_MIMXRT1015_EVK)
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1015-EVK, but targeting a custom board. You may need to "
"update your flash configuration data blocks")
"the MIMXRT1015-EVK, but targeting a custom board. You may need to "
"update your flash configuration data blocks")
endif()
if(CONFIG_BOOT_FLEXSPI_NOR)
# This flash configuration block may need modification if another
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1020_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
zephyr_library()
if(NOT DEFINED CONFIG_BOARD_MIMXRT1020_EVK)
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1020-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1020-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
endif()
if(CONFIG_BOOT_FLEXSPI_NOR)
# This flash configuration block may need modification if another
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1024_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
zephyr_library()
if(NOT DEFINED CONFIG_BOARD_MIMXRT1024_EVK)
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1024-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1024-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
endif()
if(CONFIG_BOOT_FLEXSPI_NOR)
# This flash configuration block may need modification if another
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1040_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
zephyr_library()
if(NOT DEFINED CONFIG_BOARD_MIMXRT1040_EVK)
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1040-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1040-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
endif()
if(CONFIG_BOOT_FLEXSPI_NOR)
# This flash configuration block may need modification if another
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1050_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
set(FLASH_CONF evkbimxrt1050_flexspi_nor_qspi_config.c)
else()
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1050-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1050-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
# Default EVK configuration uses hyperflash, so use that file
set(FLASH_CONF evkbimxrt1050_flexspi_nor_config.c)
endif()
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1060_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
set(BOARD_NAME mimxrt1050_evk)
else()
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1060-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1060-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
# Default EVK configuration uses qspi, so use that file
set(FLASH_CONF evkbmimxrt1060_flexspi_nor_config.c)
set(BOARD_NAME mimxrt1060_evk)
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1064_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
zephyr_library()
if(NOT DEFINED CONFIG_BOARD_MIMXRT1064_EVK)
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1064-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1064-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
endif()
if(CONFIG_BOOT_FLEXSPI_NOR)
# This flash configuration block may need modification if another
Expand Down
6 changes: 3 additions & 3 deletions boards/nxp/mimxrt1160_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
if(CONFIG_NXP_IMXRT_BOOT_HEADER)
zephyr_library()
if(NOT ((DEFINED CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7)
OR (DEFINED CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4)))
OR (DEFINED CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4)))
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1160-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1160-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
endif()
if(CONFIG_BOOT_FLEXSPI_NOR)
# This flash configuration block may need modification if another
Expand Down
4 changes: 2 additions & 2 deletions boards/nxp/mimxrt1170_evk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if(CONFIG_NXP_IMXRT_BOOT_HEADER)
if(NOT ((DEFINED CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7)
OR (DEFINED CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM4)))
message(WARNING "It appears you are using the board definition for "
"the MIMXRT1170-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
"the MIMXRT1170-EVK, but targeting a custom board. You may need to "
"update your flash configuration or device configuration data blocks")
endif()
if(${BOARD_REVISION} STREQUAL "A")
set(RT1170_BOARD_NAME "evkmimxrt1170")
Expand Down
Loading
Loading