Skip to content

Commit c2c6bee

Browse files
Andy Rosscarlescufi
authored andcommitted
drivers/timer: Remove legacy APIC driver
For a while now, we've had two APIC drivers. The older was preserved initially as the new (much smaller, "new style") code didn't have support for Quark interrupt handling. But that's long dead now. Just remove it. Note that this migrates the one board using this driver (acrn) to CONFIG_APIC_TIMER instead. Signed-off-by: Andy Ross <[email protected]>
1 parent 3134bc1 commit c2c6bee

File tree

8 files changed

+3
-748
lines changed

8 files changed

+3
-748
lines changed

boards/x86/acrn/acrn_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CONFIG_SOC_IA32=y
44
CONFIG_BOARD_ACRN=y
55
CONFIG_PIC_DISABLE=y
66
CONFIG_LOAPIC=y
7-
CONFIG_LOAPIC_TIMER=y
7+
CONFIG_APIC_TIMER=y
88
CONFIG_X2APIC=y
99
CONFIG_CONSOLE=y
1010
CONFIG_SERIAL=y

drivers/timer/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ zephyr_sources( sys_clock_init.c)
44
zephyr_sources_ifdef(CONFIG_HPET_TIMER hpet.c)
55
zephyr_sources_ifdef(CONFIG_ARCV2_TIMER arcv2_timer0.c)
66
zephyr_sources_ifdef(CONFIG_ARM_ARCH_TIMER arm_arch_timer.c)
7-
zephyr_sources_ifdef(CONFIG_LOAPIC_TIMER loapic_timer.c)
87
zephyr_sources_ifdef(CONFIG_APIC_TIMER apic_timer.c)
98
zephyr_sources_ifdef(CONFIG_ALTERA_AVALON_TIMER altera_avalon_timer_hal.c)
109
zephyr_sources_ifdef(CONFIG_ITE_IT8XXX2_TIMER ite_it8xxx2_timer.c)

drivers/timer/Kconfig

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ menuconfig APIC_TIMER
1313
depends on LOAPIC
1414
select TICKLESS_CAPABLE
1515
help
16-
Use the "new" local APIC timer driver for the system timer.
17-
This is a replacement for the legacy local APIC timer driver
18-
which supports tickless operation, but not the Quark MVIC.
16+
Use the x86 local APIC as the system time source.
1917

2018
if APIC_TIMER
2119

@@ -64,36 +62,6 @@ config HPET_TIMER
6462
This option selects High Precision Event Timer (HPET) as a
6563
system timer.
6664

67-
config LOAPIC_TIMER
68-
bool "LOAPIC timer"
69-
depends on LOAPIC && X86
70-
help
71-
This option selects LOAPIC timer as a system timer.
72-
73-
if LOAPIC_TIMER
74-
config LOAPIC_TIMER_IRQ
75-
int "Local APIC Timer IRQ"
76-
default 24
77-
help
78-
This option specifies the IRQ used by the LOAPIC timer.
79-
80-
config LOAPIC_TIMER_IRQ_PRIORITY
81-
int "Local APIC Timer IRQ Priority"
82-
default 2
83-
help
84-
This options specifies the IRQ priority used by the LOAPIC timer.
85-
86-
config TSC_CYCLES_PER_SEC
87-
int "Frequency of x86 CPU timestamp counter"
88-
default 0
89-
help
90-
The x86 implementation of LOAPIC k_cycle_get_32() relies on the x86 TSC.
91-
This runs at the CPU speed and not the bus speed. If set to 0, the
92-
value of CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC will be used instead;
93-
many MCUs these values are the same.
94-
95-
endif # LOAPIC_TIMER
96-
9765
menuconfig ARCV2_TIMER
9866
bool "ARC Timer"
9967
default y

0 commit comments

Comments
 (0)