Commit c2c6bee0 authored by Andy Ross's avatar Andy Ross Committed by Carles Cufi
Browse files

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: default avatarAndy Ross <andrew.j.ross@intel.com>
parent 3134bc1e

boards/x86/acrn/acrn_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ CONFIG_SOC_IA32=y 
CONFIG_BOARD_ACRN=y

CONFIG_PIC_DISABLE=y

CONFIG_LOAPIC=y

CONFIG_LOAPIC_TIMER=y

CONFIG_APIC_TIMER=y

CONFIG_X2APIC=y

CONFIG_CONSOLE=y

CONFIG_SERIAL=y

drivers/timer/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ zephyr_sources( sys_clock_init.c) 
zephyr_sources_ifdef(CONFIG_HPET_TIMER  hpet.c)

zephyr_sources_ifdef(CONFIG_ARCV2_TIMER arcv2_timer0.c)

zephyr_sources_ifdef(CONFIG_ARM_ARCH_TIMER arm_arch_timer.c)

zephyr_sources_ifdef(CONFIG_LOAPIC_TIMER loapic_timer.c)

zephyr_sources_ifdef(CONFIG_APIC_TIMER apic_timer.c)

zephyr_sources_ifdef(CONFIG_ALTERA_AVALON_TIMER altera_avalon_timer_hal.c)

zephyr_sources_ifdef(CONFIG_ITE_IT8XXX2_TIMER   ite_it8xxx2_timer.c)

drivers/timer/Kconfig

+1 −33
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ menuconfig APIC_TIMER 
	depends on LOAPIC

	select TICKLESS_CAPABLE

	help

	  Use the "new" local APIC timer driver for the system timer.

	  This is a replacement for the legacy local APIC timer driver

	  which supports tickless operation, but not the Quark MVIC.

	  Use the x86 local APIC as the system time source.



if APIC_TIMER
@@ -64,36 +62,6 @@ config HPET_TIMER 
	  This option selects High Precision Event Timer (HPET) as a

	  system timer.



config LOAPIC_TIMER

	bool "LOAPIC timer"

	depends on LOAPIC && X86

	help

	  This option selects LOAPIC timer as a system timer.



if LOAPIC_TIMER

config LOAPIC_TIMER_IRQ

	int "Local APIC Timer IRQ"

	default 24

	help

	  This option specifies the IRQ used by the LOAPIC timer.



config LOAPIC_TIMER_IRQ_PRIORITY

	int "Local APIC Timer IRQ Priority"

	default 2

	help

	  This options specifies the IRQ priority used by the LOAPIC timer.



config TSC_CYCLES_PER_SEC

	int "Frequency of x86 CPU timestamp counter"

	default 0

	help

	  The x86 implementation of LOAPIC k_cycle_get_32() relies on the x86 TSC.

	  This runs at the CPU speed and not the bus speed. If set to 0, the

	  value of CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC will be used instead;

	  many MCUs these values are the same.



endif # LOAPIC_TIMER



menuconfig ARCV2_TIMER

	bool "ARC Timer"

	default y

drivers/timer/loapic_timer.c

deleted100644 → 0
+0 −706

File deleted.

Preview size limit exceeded, changes collapsed.

soc/x86/atom/Kconfig.defconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config SOC 
	default "atom"



config SYS_CLOCK_HW_CYCLES_PER_SEC

	default 150000000 if LOAPIC_TIMER

	default 25000000  if HPET_TIMER



config CLFLUSH_DETECT

CRA Git | Maintained and supported by SUSTech CRA and CCSE