michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Port basic_atom configuration to HPET

Browse source 
In order to work reliably on QEMU and not depend on the
host CPU frequency change basic_atom configuration to use HPET.

Change-Id: I1253a0224bcbff4a7d54406b089c29b5ace32080
Signed-off-by: Dmitriy Korovkin <dmitriy.korovkin@windriver.com>
This commit is contained in:
Dmitriy Korovkin 2015-07-24 13:58:24 -04:00 • committed by Anas Nashif
commit 6ab23e30da
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/Kconfig
View file

@ -54,7 +54,6 @@ config PLATFORM_ATOM_N28XX
select CPU_ATOM
select IOAPIC
select LOAPIC
select LOAPIC_TIMER
select EOI_HANDLER_SUPPORTED
select BOOTLOADER_UNKNOWN
select EXTRA_SERIAL_PORT

6
arch/x86/configs/micro_basic_atom_defconfig
View file

@ -171,8 +171,10 @@ CONFIG_IOAPIC=y
#
# Timer Drivers
#
# CONFIG_HPET_TIMER is not set
CONFIG_LOAPIC_TIMER=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_LEGACY_EMULATION=y
# CONFIG_HPET_TIMER_DEBUG is not set
# CONFIG_LOAPIC_TIMER is not set
#
# Random Generation Configuration

6
arch/x86/configs/nano_basic_atom_defconfig
View file

@ -150,8 +150,10 @@ CONFIG_IOAPIC=y
#
# Timer Drivers
#
# CONFIG_HPET_TIMER is not set
CONFIG_LOAPIC_TIMER=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_LEGACY_EMULATION=y
# CONFIG_HPET_TIMER_DEBUG is not set
# CONFIG_LOAPIC_TIMER is not set
#
# Random Generation Configuration

12
arch/x86/platforms/ia32/board.h
View file

@ -99,6 +99,18 @@ the 'ia32' platform.
#define LOAPIC_VEC_BASE(x) (x + 32 + IOAPIC_NUM_RTES)
#define LOAPIC_TIMER_VEC LOAPIC_VEC_BASE(0)
/*
* HPET device information
*/
#define HPET_BASE_ADRS_PHYS 0xFED00000
#define HPET_SIZE KB(4)
#define HPET_BASE_ADRS HPET_BASE_ADRS_PHYS
#define HPET_TIMER0_VEC (HPET_TIMER0_IRQ + INT_VEC_IRQ0)
#define HPET_TIMER0_INT_PRI (4)
#define HPET_TIMER0_IRQ (2)
/* serial port (aka COM port) information */
#define COM1_BASE_ADRS 0x3f8