boards/x86/up_squared: default to new local APIC timer

This is the "flagship" platform for the new local APIC timer driver.
The opportunity is taken clean up the configuration as well, so the
choice of local APIC vs HPET timer requires changing only one Kconfig.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This commit is contained in:
Charles E. Youse 2019-06-20 16:19:59 -07:00 committed by Anas Nashif
parent c17c298749
commit c5e582038c
2 changed files with 30 additions and 11 deletions

View File

@ -28,14 +28,34 @@ config I2C_1
endif # I2C
config SYS_CLOCK_HW_CYCLES_PER_SEC
# HPET Timer: 19.2MHz
default 19200000 if HPET_TIMER
# Atom E3940 TSC: 1593.600MHz
default 1593600000 if (LOAPIC_TIMER && BOARD_UP_SQUARED_ATOM)
# Celeron N3550 base core freq: 1.1GHz
default 1100000000 if (LOAPIC_TIMER && BOARD_UP_SQUARED_CELERON)
# Pentium N3550 base core freq: 1.1GHz
default 1100000000 if (LOAPIC_TIMER && BOARD_UP_SQUARED_PENTIUM)
config APIC_TIMER
default y if !HPET_TIMER
if HPET_TIMER
config HPET_TIMER_IRQ
default 2
endif # HPET_TIMER
if APIC_TIMER
config APIC_TIMER_IRQ
default 24
config APIC_TIMER_TSC
default y
if APIC_TIMER_TSC
config APIC_TIMER_TSC_M
default 3
config APIC_TIMER_TSC_N
default 249
endif # APIC_TIMER_TSC
endif # APIC_TIMER
endif # BOARD_UP_SQUARED

View File

@ -1,10 +1,9 @@
# SPDX-License-Identifier: Apache-2.0
CONFIG_X86=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=19200000
CONFIG_SOC_APOLLO_LAKE=y
CONFIG_BOARD_UP_SQUARED=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_IRQ=2
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y