kernel: remove dependency on CONFIG_NANO_TIMERS/TIMEOUTS

Remove legacy option and use SYS_CLOCK_EXISTS where appropriate.

Change-Id: I3d524ea2776e638683f0196c0cc342359d5d810f
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-01-07 08:36:28 -05:00 committed by Anas Nashif
commit f6e039062a
46 changed files with 7 additions and 58 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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.

View file

@ -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);

View file

@ -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;
};

View file

@ -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.

View file

@ -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.

View file

@ -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 */

View file

@ -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

View file

@ -1,3 +1,2 @@
CONFIG_GPIO=y
CONFIG_NANO_TIMEOUTS=y
CONFIG_SERIAL=n

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -5,4 +5,3 @@ CONFIG_IPM_QUARK_SE=y
CONFIG_IPM_CONSOLE_SENDER=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=n
CONFIG_NANO_TIMEOUTS=y

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,4 +1,3 @@
CONFIG_NANO_TIMEOUTS=y
CONFIG_NETWORKING=y
CONFIG_NET_IPV4=y
CONFIG_NET_IPV6=y

View file

@ -1,4 +1,3 @@
CONFIG_NANO_TIMEOUTS=y
CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y
CONFIG_NET_LOG=y

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 */

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,4 +1,3 @@
CONFIG_NANO_TIMEOUTS=y
CONFIG_I2C=y
CONFIG_ADC=y
CONFIG_GPIO=y

View file

@ -1,2 +1 @@
CONFIG_ZTEST=y
CONFIG_NANO_TIMEOUTS=y

View file

@ -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

View file

@ -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