Skip to content

Commit ba64291

Browse files
aescolarhenrikbrixandersen
authored andcommitted
drivers timer: Rename native_posix_timer native_sim_timer
Including renaming the kconfig option NATIVE_POSIX_TIMER into NATIVE_SIM_TIMER deprecating the first one. Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
1 parent 6053357 commit ba64291

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

boards/native/native_sim/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config BOARD_NATIVE_SIM
55
bool
66
select POSIX_ARCH_CONSOLE
77
select NATIVE_LIBRARY
8-
select NATIVE_POSIX_TIMER
8+
select NATIVE_SIM_TIMER
99
select 64BIT if BOARD_NATIVE_SIM_NATIVE_64
1010
imply BOARD_NATIVE_POSIX if NATIVE_SIM_NATIVE_POSIX_COMPAT
1111
help

boards/native/native_sim/doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,6 @@ host libC (:kconfig:option:`CONFIG_EXTERNAL_LIBC`):
717717
Serial, :ref:`UART native PTY <native_ptty_uart>`, :kconfig:option:`CONFIG_UART_NATIVE_PTY`, All
718718
Serial, :ref:`UART native TTY <native_tty_uart>`, :kconfig:option:`CONFIG_UART_NATIVE_TTY`, All
719719
SPI, SPI emul, :kconfig:option:`CONFIG_SPI_EMUL`, All
720-
System tick, Native_posix timer, :kconfig:option:`CONFIG_NATIVE_POSIX_TIMER`, All
720+
System tick, Native_sim timer, :kconfig:option:`CONFIG_NATIVE_SIM_TIMER`, All
721721
Tracing, :ref:`Posix tracing backend <nsim_back_trace>`, :kconfig:option:`CONFIG_TRACING_BACKEND_POSIX`, All
722722
USB, :ref:`USB native posix <nsim_per_usb>`, :kconfig:option:`CONFIG_USB_NATIVE_POSIX`, Host libC

drivers/timer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ zephyr_library_sources_ifdef(CONFIG_MCUX_LPTMR_TIMER mcux_lptmr_timer.c)
2727
zephyr_library_sources_ifdef(CONFIG_MCUX_OS_TIMER mcux_os_timer.c)
2828
zephyr_library_sources_ifdef(CONFIG_MCUX_GPT_TIMER mcux_gpt_timer.c)
2929
zephyr_library_sources_ifdef(CONFIG_MIPS_CP0_TIMER mips_cp0_timer.c)
30-
zephyr_library_sources_ifdef(CONFIG_NATIVE_POSIX_TIMER native_posix_timer.c)
30+
zephyr_library_sources_ifdef(CONFIG_NATIVE_SIM_TIMER native_sim_timer.c)
3131
zephyr_library_sources_ifdef(CONFIG_NPCX_ITIM_TIMER npcx_itim_timer.c)
3232
zephyr_library_sources_ifdef(CONFIG_NRF_GRTC_TIMER nrf_grtc_timer.c)
3333
zephyr_library_sources_ifdef(CONFIG_NRF_RTC_TIMER nrf_rtc_timer.c)

drivers/timer/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ source "drivers/timer/Kconfig.mcux_lptmr"
8484
source "drivers/timer/Kconfig.mcux_os"
8585
source "drivers/timer/Kconfig.mec5"
8686
source "drivers/timer/Kconfig.mips_cp0"
87-
source "drivers/timer/Kconfig.native_posix"
87+
source "drivers/timer/Kconfig.native_sim"
8888
source "drivers/timer/Kconfig.npcx_itim"
8989
source "drivers/timer/Kconfig.nrf_rtc"
9090
source "drivers/timer/Kconfig.nrf_grtc"

drivers/timer/Kconfig.native_posix renamed to drivers/timer/Kconfig.native_sim

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
# Copyright (c) 2019 Intel Corp.
44
# SPDX-License-Identifier: Apache-2.0
55

6-
config NATIVE_POSIX_TIMER
7-
bool "(POSIX) native_sim/posix timer driver"
6+
config NATIVE_SIM_TIMER
7+
bool "(POSIX) native_sim timer driver"
88
default y
9-
depends on BOARD_NATIVE_POSIX || BOARD_NATIVE_SIM
9+
depends on BOARD_NATIVE_SIM
1010
select TICKLESS_CAPABLE
1111
select TIMER_HAS_64BIT_CYCLE_COUNTER
1212
select SYSTEM_TIMER_HAS_DISABLE_SUPPORT
1313
help
14-
This module implements a kernel device driver for the native_sim/posix HW timer
15-
model
14+
This module implements a kernel device driver for the native_sim HW timer model
15+
16+
config NATIVE_POSIX_TIMER
17+
bool "(POSIX) native_sim/posix timer driver (deprecated)"
18+
select NATIVE_SIM_TIMER
19+
select DEPRECATED
20+
depends on BOARD_NATIVE_SIM
21+
help
22+
Deprecated option. Replaced by NATIVE_SIM_TIMER
File renamed without changes.

0 commit comments

Comments
 (0)