diff --git a/boards/native/native_sim/Kconfig b/boards/native/native_sim/Kconfig index 1e79e7409d6..4ecdbf702f5 100644 --- a/boards/native/native_sim/Kconfig +++ b/boards/native/native_sim/Kconfig @@ -5,7 +5,7 @@ config BOARD_NATIVE_SIM bool select POSIX_ARCH_CONSOLE select NATIVE_LIBRARY - select NATIVE_POSIX_TIMER + select NATIVE_SIM_TIMER select 64BIT if BOARD_NATIVE_SIM_NATIVE_64 imply BOARD_NATIVE_POSIX if NATIVE_SIM_NATIVE_POSIX_COMPAT help diff --git a/boards/native/native_sim/doc/index.rst b/boards/native/native_sim/doc/index.rst index 78384c6d01d..8cdffc32526 100644 --- a/boards/native/native_sim/doc/index.rst +++ b/boards/native/native_sim/doc/index.rst @@ -717,6 +717,6 @@ host libC (:kconfig:option:`CONFIG_EXTERNAL_LIBC`): Serial, :ref:`UART native PTY `, :kconfig:option:`CONFIG_UART_NATIVE_PTY`, All Serial, :ref:`UART native TTY `, :kconfig:option:`CONFIG_UART_NATIVE_TTY`, All SPI, SPI emul, :kconfig:option:`CONFIG_SPI_EMUL`, All - System tick, Native_posix timer, :kconfig:option:`CONFIG_NATIVE_POSIX_TIMER`, All + System tick, Native_sim timer, :kconfig:option:`CONFIG_NATIVE_SIM_TIMER`, All Tracing, :ref:`Posix tracing backend `, :kconfig:option:`CONFIG_TRACING_BACKEND_POSIX`, All USB, :ref:`USB native posix `, :kconfig:option:`CONFIG_USB_NATIVE_POSIX`, Host libC diff --git a/drivers/timer/CMakeLists.txt b/drivers/timer/CMakeLists.txt index 9a6b2697e98..dd764c5bc7a 100644 --- a/drivers/timer/CMakeLists.txt +++ b/drivers/timer/CMakeLists.txt @@ -27,7 +27,7 @@ zephyr_library_sources_ifdef(CONFIG_MCUX_LPTMR_TIMER mcux_lptmr_timer.c) zephyr_library_sources_ifdef(CONFIG_MCUX_OS_TIMER mcux_os_timer.c) zephyr_library_sources_ifdef(CONFIG_MCUX_GPT_TIMER mcux_gpt_timer.c) zephyr_library_sources_ifdef(CONFIG_MIPS_CP0_TIMER mips_cp0_timer.c) -zephyr_library_sources_ifdef(CONFIG_NATIVE_POSIX_TIMER native_posix_timer.c) +zephyr_library_sources_ifdef(CONFIG_NATIVE_SIM_TIMER native_sim_timer.c) zephyr_library_sources_ifdef(CONFIG_NPCX_ITIM_TIMER npcx_itim_timer.c) zephyr_library_sources_ifdef(CONFIG_NRF_GRTC_TIMER nrf_grtc_timer.c) zephyr_library_sources_ifdef(CONFIG_NRF_RTC_TIMER nrf_rtc_timer.c) diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 839dec71fa2..3777e24bffb 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -84,7 +84,7 @@ source "drivers/timer/Kconfig.mcux_lptmr" source "drivers/timer/Kconfig.mcux_os" source "drivers/timer/Kconfig.mec5" source "drivers/timer/Kconfig.mips_cp0" -source "drivers/timer/Kconfig.native_posix" +source "drivers/timer/Kconfig.native_sim" source "drivers/timer/Kconfig.npcx_itim" source "drivers/timer/Kconfig.nrf_rtc" source "drivers/timer/Kconfig.nrf_grtc" diff --git a/drivers/timer/Kconfig.native_posix b/drivers/timer/Kconfig.native_sim similarity index 55% rename from drivers/timer/Kconfig.native_posix rename to drivers/timer/Kconfig.native_sim index ad2c4acad76..780517b973a 100644 --- a/drivers/timer/Kconfig.native_posix +++ b/drivers/timer/Kconfig.native_sim @@ -3,13 +3,20 @@ # Copyright (c) 2019 Intel Corp. # SPDX-License-Identifier: Apache-2.0 -config NATIVE_POSIX_TIMER - bool "(POSIX) native_sim/posix timer driver" +config NATIVE_SIM_TIMER + bool "(POSIX) native_sim timer driver" default y - depends on BOARD_NATIVE_POSIX || BOARD_NATIVE_SIM + depends on BOARD_NATIVE_SIM select TICKLESS_CAPABLE select TIMER_HAS_64BIT_CYCLE_COUNTER select SYSTEM_TIMER_HAS_DISABLE_SUPPORT help - This module implements a kernel device driver for the native_sim/posix HW timer - model + This module implements a kernel device driver for the native_sim HW timer model + +config NATIVE_POSIX_TIMER + bool "(POSIX) native_sim/posix timer driver (deprecated)" + select NATIVE_SIM_TIMER + select DEPRECATED + depends on BOARD_NATIVE_SIM + help + Deprecated option. Replaced by NATIVE_SIM_TIMER diff --git a/drivers/timer/native_posix_timer.c b/drivers/timer/native_sim_timer.c similarity index 100% rename from drivers/timer/native_posix_timer.c rename to drivers/timer/native_sim_timer.c