[yocto] [PATCH 02/14][KERNEL] meta: replace open-coded hpet options with hpet feature

[tom.zanussi at intel.com]

From: Tom Zanussi <tom.zanussi at intel.com>

Have common-pc-64 use the hpet feature, and remove the corresponding
options in common-pc64.cfg.  Also remove the hpet options from arm and
ppc machines where they're noops.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 .../arm-versatile-926ejs/arm-versatile-926ejs.cfg  |    1 -
 .../kernel-cache/bsp/common-pc-64/common-pc-64.cfg |    3 ---
 .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |    1 +
 .../cfg/kernel-cache/bsp/qemu-ppc32/qemu-ppc32.cfg |    1 -
 4 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg b/meta/cfg/kernel-cache/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg
index fc006f8..616df5b 100644
--- a/meta/cfg/kernel-cache/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg
+++ b/meta/cfg/kernel-cache/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg
@@ -85,7 +85,6 @@ CONFIG_TIMER_STATS=y
 
 # CONFIG_NO_HZ is not set
 # CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_HPET_TIMER=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_USB_SUSPEND=y
 CONFIG_SND_AC97_POWER_SAVE=y
diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
index deedd17..4914266 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
@@ -26,8 +26,6 @@ CONFIG_X86_CPUID=y
 CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=24
 
-CONFIG_HPET_TIMER=y
-
 CONFIG_PM=y
 CONFIG_ACPI=y
 # CONFIG_ACPI_AC is not set
@@ -57,7 +55,6 @@ CONFIG_E1000=y
 
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_CMOS=y
-CONFIG_HPET_EMULATE_RTC=y
 
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
index a468b71..e193206 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
@@ -1,5 +1,6 @@
 kconf hardware common-pc-64.cfg
 kconf hardware common-pc-64-graphics.cfg
 
+include features/hpet/hpet.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
diff --git a/meta/cfg/kernel-cache/bsp/qemu-ppc32/qemu-ppc32.cfg b/meta/cfg/kernel-cache/bsp/qemu-ppc32/qemu-ppc32.cfg
index 311c622..950d87a 100644
--- a/meta/cfg/kernel-cache/bsp/qemu-ppc32/qemu-ppc32.cfg
+++ b/meta/cfg/kernel-cache/bsp/qemu-ppc32/qemu-ppc32.cfg
@@ -36,7 +36,6 @@ CONFIG_X86_UP_APIC=y
 CONFIG_X86_LOCAL_APIC=y
 
 CONFIG_TIMER_STATS=y
-CONFIG_HPET_TIMER=y
 CONFIG_CPU_FREQ_ONDEMAND=y
 CONFIG_USB_SUSPEND=y
 CONFIG_TIMER_STATS=y
-- 
1.7.0.4