diff --git a/boards/arc/arduino_101_sss/arduino_101_sss_defconfig b/boards/arc/arduino_101_sss/arduino_101_sss_defconfig index 8d4518c7751..1d409a8a04c 100644 --- a/boards/arc/arduino_101_sss/arduino_101_sss_defconfig +++ b/boards/arc/arduino_101_sss/arduino_101_sss_defconfig @@ -4,7 +4,6 @@ CONFIG_BOARD_ARDUINO_101_SSS=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 CONFIG_XIP=y -CONFIG_NANO_TIMERS=y CONFIG_PRINTK=y CONFIG_CPU_ARCEM4=y CONFIG_CPU_ARCV2=y diff --git a/boards/arc/em_starterkit/em_starterkit_defconfig b/boards/arc/em_starterkit/em_starterkit_defconfig index d18c37619f8..f763066a02e 100644 --- a/boards/arc/em_starterkit/em_starterkit_defconfig +++ b/boards/arc/em_starterkit/em_starterkit_defconfig @@ -3,7 +3,6 @@ CONFIG_SOC_EM7D=y CONFIG_BOARD_EM_STARTERKIT=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 CONFIG_XIP=n -CONFIG_NANO_TIMERS=y CONFIG_PRINTK=y CONFIG_CPU_ARCEM4=y CONFIG_CPU_ARCV2=y diff --git a/boards/arc/quark_se_c1000_ss_devboard/quark_se_c1000_ss_devboard_defconfig b/boards/arc/quark_se_c1000_ss_devboard/quark_se_c1000_ss_devboard_defconfig index 4df9b6662a2..994d1a7d7df 100644 --- a/boards/arc/quark_se_c1000_ss_devboard/quark_se_c1000_ss_devboard_defconfig +++ b/boards/arc/quark_se_c1000_ss_devboard/quark_se_c1000_ss_devboard_defconfig @@ -4,7 +4,6 @@ CONFIG_BOARD_QUARK_SE_C1000_DEVBOARD_SS=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=100 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 CONFIG_XIP=y -CONFIG_NANO_TIMERS=y CONFIG_PRINTK=y CONFIG_CPU_ARCEM4=y CONFIG_CPU_ARCV2=y diff --git a/boards/x86/galileo/galileo_defconfig b/boards/x86/galileo/galileo_defconfig index 7d2f234b400..d31a8cbc8e5 100644 --- a/boards/x86/galileo/galileo_defconfig +++ b/boards/x86/galileo/galileo_defconfig @@ -1,5 +1,3 @@ -CONFIG_NANO_TIMERS=y -CONFIG_NANO_TIMEOUTS=y CONFIG_X86=y CONFIG_SOC_QUARK_X1000=y CONFIG_SOC_SERIES_QUARK_X1000=y diff --git a/drivers/gpio/Kconfig.pcal9535a b/drivers/gpio/Kconfig.pcal9535a index ab0108c9a43..0cec68b36d5 100644 --- a/drivers/gpio/Kconfig.pcal9535a +++ b/drivers/gpio/Kconfig.pcal9535a @@ -20,7 +20,6 @@ menuconfig GPIO_PCAL9535A bool "PCAL9535A I2C-based GPIO chip" depends on GPIO && I2C default n - select NANO_TIMERS help Enable driver for PCAL9535A I2C-based GPIO chip. diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c index 52e2ae0143d..8f35efec3e2 100644 --- a/drivers/sensor/hp206c/hp206c.c +++ b/drivers/sensor/hp206c/hp206c.c @@ -180,12 +180,8 @@ static int hp206c_wait_dev_ready(struct device *dev, uint32_t timeout_ms) struct hp206c_device_data *hp206c = dev->driver_data; uint8_t int_src; -#ifdef CONFIG_NANO_TIMERS k_timer_start(&hp206c->tmr, timeout_ms, 0); k_timer_status_sync(&hp206c->tmr); -#else - k_busy_wait(timeout_ms * 1000); -#endif if (hp206c_read_reg(dev, HP206C_REG_INT_SRC, &int_src) < 0) { return -EIO; @@ -319,9 +315,7 @@ static int hp206c_init(struct device *dev) return -EIO; } -#ifdef CONFIG_NANO_TIMERS k_timer_init(&hp206c->tmr, NULL, NULL); -#endif k_busy_wait(500); diff --git a/drivers/sensor/hp206c/hp206c.h b/drivers/sensor/hp206c/hp206c.h index 9297c93d931..597c9334734 100644 --- a/drivers/sensor/hp206c/hp206c.h +++ b/drivers/sensor/hp206c/hp206c.h @@ -84,12 +84,10 @@ struct hp206c_device_data { struct device *i2c; -#ifdef CONFIG_NANO_TIMERS #if CONFIG_SYS_CLOCK_TICKS_PER_SEC != 1000 #error "driver needs millisecond tick granularity" #endif struct k_timer tmr; -#endif uint8_t osr; }; diff --git a/drivers/sensor/isl29035/Kconfig b/drivers/sensor/isl29035/Kconfig index 78f3663a18e..3199c96fa94 100644 --- a/drivers/sensor/isl29035/Kconfig +++ b/drivers/sensor/isl29035/Kconfig @@ -20,7 +20,7 @@ menuconfig ISL29035 bool prompt "ISL29035 light sensor" default n - depends on SENSOR && I2C && NANO_TIMERS && NANO_TIMEOUTS + depends on SENSOR && I2C help Enable driver for the ISL29035 light sensor. diff --git a/drivers/sensor/th02/Kconfig b/drivers/sensor/th02/Kconfig index eed9491f63b..f998239559f 100644 --- a/drivers/sensor/th02/Kconfig +++ b/drivers/sensor/th02/Kconfig @@ -18,7 +18,7 @@ menuconfig TH02 bool prompt "TH02 Temperature Sensor" default n - depends on SENSOR && I2C && NANO_TIMERS && NANO_TIMEOUTS + depends on SENSOR && I2C help Enable driver for the TH02 temperature sensor. diff --git a/include/logging/event_logger.h b/include/logging/event_logger.h index fa09f67396e..a658724e942 100644 --- a/include/logging/event_logger.h +++ b/include/logging/event_logger.h @@ -127,7 +127,7 @@ int sys_event_logger_get_wait(struct event_logger *logger, uint16_t *event_id, uint8_t *dropped_event_count, uint32_t *buffer, uint8_t *buffer_size); -#ifdef CONFIG_NANO_TIMEOUTS +#ifdef CONFIG_SYS_CLOCK_EXISTS /** * @brief Retrieve an event message from the logger, wait with a timeout if * empty. @@ -162,7 +162,7 @@ int sys_event_logger_get_wait_timeout(struct event_logger *logger, * @} */ -#endif /* CONFIG_NANO_TIMEOUTS */ +#endif /* CONFIG_SYS_CLOCK_EXISTS */ #endif /* _ASMLANGUAGE */ diff --git a/kernel/include/kernel_structs.h b/kernel/include/kernel_structs.h index 1e63f04aa6e..234ea7770e5 100644 --- a/kernel/include/kernel_structs.h +++ b/kernel/include/kernel_structs.h @@ -87,7 +87,7 @@ struct _thread_base { /* data returned by APIs */ void *swap_data; -#ifdef CONFIG_NANO_TIMEOUTS +#ifdef CONFIG_SYS_CLOCK_EXISTS /* this thread's entry in a timeout queue */ struct _timeout timeout; #endif diff --git a/samples/basic/blinky/prj.conf b/samples/basic/blinky/prj.conf index 21db6cbcd58..7bbd5afcc29 100644 --- a/samples/basic/blinky/prj.conf +++ b/samples/basic/blinky/prj.conf @@ -1,3 +1,2 @@ CONFIG_GPIO=y -CONFIG_NANO_TIMEOUTS=y CONFIG_SERIAL=n diff --git a/samples/bluetooth/ipsp/prj.conf b/samples/bluetooth/ipsp/prj.conf index 859a0b1a3bb..c69c7026a36 100644 --- a/samples/bluetooth/ipsp/prj.conf +++ b/samples/bluetooth/ipsp/prj.conf @@ -8,7 +8,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IPV4=n CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_NET_L2_BLUETOOTH=y diff --git a/samples/environmental_sensing/ap/prj.conf b/samples/environmental_sensing/ap/prj.conf index 70c5534f04d..b67dfdca7f4 100644 --- a/samples/environmental_sensing/ap/prj.conf +++ b/samples/environmental_sensing/ap/prj.conf @@ -4,7 +4,6 @@ CONFIG_IPM=y CONFIG_IPM_QUARK_SE=y CONFIG_IPM_QUARK_SE_MASTER=y CONFIG_IPM_CONSOLE_SENDER=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TIMESLICE_SIZE=1 CONFIG_BLUETOOTH=y CONFIG_BLUETOOTH_PERIPHERAL=y diff --git a/samples/environmental_sensing/sensor/prj.conf b/samples/environmental_sensing/sensor/prj.conf index 20dcbad88b2..0a31469ae6c 100644 --- a/samples/environmental_sensing/sensor/prj.conf +++ b/samples/environmental_sensing/sensor/prj.conf @@ -5,7 +5,6 @@ CONFIG_IPM_QUARK_SE=y CONFIG_IPM_CONSOLE_RECEIVER=y CONFIG_CONSOLE=y CONFIG_SERIAL=n -CONFIG_NANO_TIMEOUTS=y CONFIG_I2C=y CONFIG_GPIO=y CONFIG_SENSOR=y diff --git a/samples/ipm/ipm_demo_arc/prj.conf b/samples/ipm/ipm_demo_arc/prj.conf index 594dd6a1964..34a219cffef 100644 --- a/samples/ipm/ipm_demo_arc/prj.conf +++ b/samples/ipm/ipm_demo_arc/prj.conf @@ -5,4 +5,3 @@ CONFIG_IPM_QUARK_SE=y CONFIG_IPM_CONSOLE_SENDER=y CONFIG_CONSOLE=y CONFIG_SERIAL=n -CONFIG_NANO_TIMEOUTS=y diff --git a/samples/ipm/ipm_demo_lmt/prj.conf b/samples/ipm/ipm_demo_lmt/prj.conf index 8b011ec4ec6..92acd686a06 100644 --- a/samples/ipm/ipm_demo_lmt/prj.conf +++ b/samples/ipm/ipm_demo_lmt/prj.conf @@ -4,6 +4,5 @@ CONFIG_IPM=y CONFIG_IPM_QUARK_SE=y CONFIG_IPM_QUARK_SE_MASTER=y CONFIG_IPM_CONSOLE_RECEIVER=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TIMESLICE_SIZE=1 CONFIG_MAIN_STACK_SIZE=2048 diff --git a/samples/net/dns_client/prj_arduino_101.conf b/samples/net/dns_client/prj_arduino_101.conf index 124e843dc8a..b5e27ff58c3 100644 --- a/samples/net/dns_client/prj_arduino_101.conf +++ b/samples/net/dns_client/prj_arduino_101.conf @@ -1,7 +1,6 @@ CONFIG_NETWORKING=y CONFIG_NET_IPV4=y CONFIG_NET_UDP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_ARP=y diff --git a/samples/net/dns_client/prj_frdm_k64f.conf b/samples/net/dns_client/prj_frdm_k64f.conf index dbeae1696d4..6946c4adf26 100644 --- a/samples/net/dns_client/prj_frdm_k64f.conf +++ b/samples/net/dns_client/prj_frdm_k64f.conf @@ -1,7 +1,6 @@ CONFIG_NETWORKING=y CONFIG_NET_IPV4=y CONFIG_NET_UDP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_RANDOM_GENERATOR=y CONFIG_NET_ARP=y CONFIG_NET_L2_ETHERNET=y diff --git a/samples/net/dns_client/prj_qemu_x86.conf b/samples/net/dns_client/prj_qemu_x86.conf index 8b8a973b14b..c5aac057b96 100644 --- a/samples/net/dns_client/prj_qemu_x86.conf +++ b/samples/net/dns_client/prj_qemu_x86.conf @@ -1,7 +1,6 @@ CONFIG_NETWORKING=y CONFIG_NET_IPV4=y CONFIG_NET_UDP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y diff --git a/samples/net/echo_client/prj_arduino_101.conf b/samples/net/echo_client/prj_arduino_101.conf index 1ca164a57ee..01743afcb7c 100644 --- a/samples/net/echo_client/prj_arduino_101.conf +++ b/samples/net/echo_client/prj_arduino_101.conf @@ -3,7 +3,6 @@ CONFIG_NET_LOG=y CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=1024 CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NANO_TIMEOUTS=y # IP Stack Configuration CONFIG_NETWORKING=y CONFIG_NET_ARP=y diff --git a/samples/net/echo_client/prj_bt.conf b/samples/net/echo_client/prj_bt.conf index 619ef3d83f9..98e7c0990a2 100644 --- a/samples/net/echo_client/prj_bt.conf +++ b/samples/net/echo_client/prj_bt.conf @@ -10,7 +10,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IPV4=n CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_NET_L2_BLUETOOTH=y diff --git a/samples/net/echo_client/prj_qemu_x86.conf b/samples/net/echo_client/prj_qemu_x86.conf index 163dc271b5c..1818a2efc16 100644 --- a/samples/net/echo_client/prj_qemu_x86.conf +++ b/samples/net/echo_client/prj_qemu_x86.conf @@ -3,7 +3,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IPV4=y CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_NET_SLIP=y diff --git a/samples/net/echo_client/prj_slip.conf b/samples/net/echo_client/prj_slip.conf index 163dc271b5c..1818a2efc16 100644 --- a/samples/net/echo_client/prj_slip.conf +++ b/samples/net/echo_client/prj_slip.conf @@ -3,7 +3,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IPV4=y CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_NET_SLIP=y diff --git a/samples/net/echo_server/prj_arduino_101.conf b/samples/net/echo_server/prj_arduino_101.conf index ebdcd8ef0c1..f3c21342bed 100644 --- a/samples/net/echo_server/prj_arduino_101.conf +++ b/samples/net/echo_server/prj_arduino_101.conf @@ -3,7 +3,6 @@ CONFIG_NET_LOG=y CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=1024 CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NANO_TIMEOUTS=y # IP Stack Configuration CONFIG_NETWORKING=y CONFIG_NET_ARP=y diff --git a/samples/net/echo_server/prj_bt.conf b/samples/net/echo_server/prj_bt.conf index 619ef3d83f9..98e7c0990a2 100644 --- a/samples/net/echo_server/prj_bt.conf +++ b/samples/net/echo_server/prj_bt.conf @@ -10,7 +10,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IPV4=n CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_NET_L2_BLUETOOTH=y diff --git a/samples/net/echo_server/prj_frdm_k64f.conf b/samples/net/echo_server/prj_frdm_k64f.conf index fbcea6dd0bc..3fb9b3606ff 100644 --- a/samples/net/echo_server/prj_frdm_k64f.conf +++ b/samples/net/echo_server/prj_frdm_k64f.conf @@ -15,7 +15,6 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1 CONFIG_NET_MAX_CONTEXTS=10 -CONFIG_NANO_TIMEOUTS=y CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_SYS_LOG_SHOW_COLOR=y diff --git a/samples/net/echo_server/prj_qemu_x86.conf b/samples/net/echo_server/prj_qemu_x86.conf index 163dc271b5c..1818a2efc16 100644 --- a/samples/net/echo_server/prj_qemu_x86.conf +++ b/samples/net/echo_server/prj_qemu_x86.conf @@ -3,7 +3,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IPV4=y CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_NET_SLIP=y diff --git a/samples/net/echo_server/prj_slip.conf b/samples/net/echo_server/prj_slip.conf index 163dc271b5c..1818a2efc16 100644 --- a/samples/net/echo_server/prj_slip.conf +++ b/samples/net/echo_server/prj_slip.conf @@ -3,7 +3,6 @@ CONFIG_NET_IPV6=y CONFIG_NET_IPV4=y CONFIG_NET_UDP=y CONFIG_NET_TCP=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_NET_LOG=y CONFIG_NET_SLIP=y diff --git a/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf b/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf index e09863c146a..21cc62d4661 100644 --- a/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf +++ b/samples/net/mbedtls_dtlsclient/prj_arduino_101.conf @@ -3,7 +3,6 @@ CONFIG_NET_LOG=y CONFIG_INIT_STACKS=y CONFIG_MAIN_STACK_SIZE=4096 CONFIG_TEST_RANDOM_GENERATOR=y -CONFIG_NANO_TIMEOUTS=y CONFIG_NETWORKING=y CONFIG_NET_ARP=y diff --git a/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf b/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf index 9ef9eef778a..65375faed4c 100644 --- a/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf +++ b/samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf @@ -7,7 +7,6 @@ CONFIG_NET_SLIP=y CONFIG_SLIP_TAP=y CONFIG_SYS_LOG=y CONFIG_SYS_LOG_SHOW_COLOR=y -CONFIG_NANO_TIMEOUTS=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/samples/net/zoap_client/prj.conf b/samples/net/zoap_client/prj.conf index f32b600700f..55851c7845d 100644 --- a/samples/net/zoap_client/prj.conf +++ b/samples/net/zoap_client/prj.conf @@ -1,4 +1,3 @@ -CONFIG_NANO_TIMEOUTS=y CONFIG_NETWORKING=y CONFIG_NET_IPV4=y CONFIG_NET_IPV6=y diff --git a/samples/net/zoap_server/prj.conf b/samples/net/zoap_server/prj.conf index 64a35fbdad9..973a3e7364b 100644 --- a/samples/net/zoap_server/prj.conf +++ b/samples/net/zoap_server/prj.conf @@ -1,4 +1,3 @@ -CONFIG_NANO_TIMEOUTS=y CONFIG_NETWORKING=y CONFIG_NET_IPV6=y CONFIG_NET_LOG=y diff --git a/samples/net/zperf/prj_frdm_k64f.conf b/samples/net/zperf/prj_frdm_k64f.conf index 9d6e6e255b7..b9bb6562010 100644 --- a/samples/net/zperf/prj_frdm_k64f.conf +++ b/samples/net/zperf/prj_frdm_k64f.conf @@ -17,7 +17,6 @@ CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2 CONFIG_NET_MAX_CONTEXTS=10 CONFIG_NET_CONTEXT_SYNC_RECV=y -CONFIG_NANO_TIMEOUTS=y CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_SYS_LOG_SHOW_COLOR=y diff --git a/samples/net/zperf/prj_frdm_k64f_prof.conf b/samples/net/zperf/prj_frdm_k64f_prof.conf index 5552f0167e7..ea481a40993 100644 --- a/samples/net/zperf/prj_frdm_k64f_prof.conf +++ b/samples/net/zperf/prj_frdm_k64f_prof.conf @@ -17,7 +17,6 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2 CONFIG_NET_MAX_CONTEXTS=10 -CONFIG_NANO_TIMEOUTS=y CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_SYS_LOG_SHOW_COLOR=y @@ -40,7 +39,6 @@ CONFIG_NET_SHELL=y # Profiler # CONFIG_RING_BUFFER=y -CONFIG_NANO_TIMEOUTS=y CONFIG_KERNEL_EVENT_LOGGER=y CONFIG_KERNEL_EVENT_LOGGER_BUFFER_SIZE=10000 CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH=y diff --git a/samples/net/zperf/prj_galileo_ethernet_prof.conf b/samples/net/zperf/prj_galileo_ethernet_prof.conf index 12873fc923e..fb0267a8d19 100644 --- a/samples/net/zperf/prj_galileo_ethernet_prof.conf +++ b/samples/net/zperf/prj_galileo_ethernet_prof.conf @@ -32,7 +32,6 @@ CONFIG_PCI_ENUMERATION=y # Profiler # CONFIG_RING_BUFFER=y -CONFIG_NANO_TIMEOUTS=y CONFIG_KERNEL_EVENT_LOGGER=y CONFIG_KERNEL_EVENT_LOGGER_BUFFER_SIZE=10000 CONFIG_KERNEL_EVENT_LOGGER_CONTEXT_SWITCH=y diff --git a/samples/net/zperf/prj_qemu_x86.conf b/samples/net/zperf/prj_qemu_x86.conf index d90707ea6ec..ab8bc1fc8a9 100644 --- a/samples/net/zperf/prj_qemu_x86.conf +++ b/samples/net/zperf/prj_qemu_x86.conf @@ -18,7 +18,6 @@ CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1 CONFIG_NET_MAX_CONTEXTS=3 CONFIG_NET_CONTEXT_SYNC_RECV=y -CONFIG_NANO_TIMEOUTS=y CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_SYS_LOG_SHOW_COLOR=y diff --git a/samples/net/zperf/prj_quark_se_c1000_devboard.conf b/samples/net/zperf/prj_quark_se_c1000_devboard.conf index 5b8cc3cbe74..cff8c26ff67 100644 --- a/samples/net/zperf/prj_quark_se_c1000_devboard.conf +++ b/samples/net/zperf/prj_quark_se_c1000_devboard.conf @@ -14,7 +14,6 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2 CONFIG_NET_MAX_CONTEXTS=10 CONFIG_NET_CONTEXT_SYNC_RECV=y -CONFIG_NANO_TIMEOUTS=y CONFIG_ARC_INIT=n CONFIG_INIT_STACKS=y CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/subsys/logging/event_logger.c b/subsys/logging/event_logger.c index fa96840713b..3af5c58f735 100644 --- a/subsys/logging/event_logger.c +++ b/subsys/logging/event_logger.c @@ -135,7 +135,7 @@ int sys_event_logger_get_wait(struct event_logger *logger, uint16_t *event_id, } -#ifdef CONFIG_NANO_TIMEOUTS +#ifdef CONFIG_SYS_CLOCK_EXISTS int sys_event_logger_get_wait_timeout(struct event_logger *logger, uint16_t *event_id, uint8_t *dropped_event_count, @@ -148,4 +148,4 @@ int sys_event_logger_get_wait_timeout(struct event_logger *logger, } return 0; } -#endif /* CONFIG_NANO_TIMEOUTS */ +#endif /* CONFIG_SYS_CLOCK_EXISTS */ diff --git a/subsys/net/Kconfig b/subsys/net/Kconfig index 0064e776d1f..720655cbb75 100644 --- a/subsys/net/Kconfig +++ b/subsys/net/Kconfig @@ -60,8 +60,6 @@ config NET_BUF_SIMPLE_LOG config NETWORKING bool "Link layer and IP networking support" - select NANO_TIMEOUTS - select NANO_TIMERS select NET_BUF select RANDOM_GENERATOR default n diff --git a/tests/drivers/build_all/sensors_a_m.conf b/tests/drivers/build_all/sensors_a_m.conf index 8aea245bb71..bd82f15be3a 100644 --- a/tests/drivers/build_all/sensors_a_m.conf +++ b/tests/drivers/build_all/sensors_a_m.conf @@ -1,6 +1,5 @@ CONFIG_GPIO=y CONFIG_I2C=y -CONFIG_NANO_TIMEOUTS=y CONFIG_SENSOR=y CONFIG_SPI=y CONFIG_SYS_LOG_SENSOR_LEVEL=4 diff --git a/tests/drivers/build_all/sensors_n_z.conf b/tests/drivers/build_all/sensors_n_z.conf index ce86a572527..6396090ac68 100644 --- a/tests/drivers/build_all/sensors_n_z.conf +++ b/tests/drivers/build_all/sensors_n_z.conf @@ -1,11 +1,9 @@ CONFIG_GPIO=y -CONFIG_NANO_TIMEOUTS=y CONFIG_SENSOR=y CONFIG_SPI=y CONFIG_SYS_LOG_SENSOR_LEVEL=4 CONFIG_GPIO=y CONFIG_I2C=y -CONFIG_NANO_TIMEOUTS=y CONFIG_SENSOR=y CONFIG_SPI=y CONFIG_SYS_LOG_SENSOR_LEVEL=4 diff --git a/tests/drivers/build_all/sensors_trigger.conf b/tests/drivers/build_all/sensors_trigger.conf index 27b5c951f7f..21ff052a60c 100644 --- a/tests/drivers/build_all/sensors_trigger.conf +++ b/tests/drivers/build_all/sensors_trigger.conf @@ -1,4 +1,3 @@ -CONFIG_NANO_TIMEOUTS=y CONFIG_I2C=y CONFIG_ADC=y CONFIG_GPIO=y diff --git a/tests/kernel/threads_lifecycle/thread_init/prj.conf b/tests/kernel/threads_lifecycle/thread_init/prj.conf index c99d02b5c7b..9467c292689 100644 --- a/tests/kernel/threads_lifecycle/thread_init/prj.conf +++ b/tests/kernel/threads_lifecycle/thread_init/prj.conf @@ -1,2 +1 @@ CONFIG_ZTEST=y -CONFIG_NANO_TIMEOUTS=y diff --git a/tests/net/ipv6/prj.conf b/tests/net/ipv6/prj.conf index 35e082ecf9c..808d5175c74 100644 --- a/tests/net/ipv6/prj.conf +++ b/tests/net/ipv6/prj.conf @@ -15,7 +15,6 @@ CONFIG_NET_NBUF_RX_COUNT=4 CONFIG_NET_NBUF_DATA_COUNT=7 CONFIG_NET_6LO=y CONFIG_NET_6LO_CONTEXT=y -CONFIG_NANO_TIMEOUTS=y #CONFIG_NET_DEBUG_IF=y #CONFIG_NET_DEBUG_CORE=y #CONFIG_NET_DEBUG_IPV6=y diff --git a/tests/power/power_states/prj_socwatch.conf b/tests/power/power_states/prj_socwatch.conf index 3efe6f0ec23..8b161bf0538 100644 --- a/tests/power/power_states/prj_socwatch.conf +++ b/tests/power/power_states/prj_socwatch.conf @@ -24,7 +24,6 @@ CONFIG_AIO_COMPARATOR=n # Enable SoCWatch power event tracing CONFIG_SOC_WATCH=y CONFIG_RING_BUFFER=y -CONFIG_NANO_TIMEOUTS=y CONFIG_IDLE_STACK_SIZE=512 CONFIG_KERNEL_EVENT_LOGGER=y CONFIG_KERNEL_EVENT_LOGGER_BUFFER_SIZE=16