From 73d74a5abb6d47c2996fda526dd473ee98133e3e Mon Sep 17 00:00:00 2001
From: Dirk Brandewie <dirk.j.brandewie@intel.com>
Date: Fri, 5 Jun 2015 11:01:57 -0700
Subject: [PATCH] x86/bsp: move hpet driver to drivers/timer

Change-Id: I63c361a586d2fd8c03674febd58bc1dfd2658fdc
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
---
 arch/x86/timer/Kconfig             |  7 -------
 arch/x86/timer/Makefile            |  1 -
 drivers/timer/Kconfig              | 15 ++++++++++++++-
 drivers/timer/Makefile             |  3 ++-
 {arch/x86 => drivers}/timer/hpet.c |  0
 5 files changed, 16 insertions(+), 10 deletions(-)
 rename {arch/x86 => drivers}/timer/hpet.c (100%)

diff --git a/arch/x86/timer/Kconfig b/arch/x86/timer/Kconfig
index 0d4cab74fa6..54ba586d2da 100644
--- a/arch/x86/timer/Kconfig
+++ b/arch/x86/timer/Kconfig
@@ -32,13 +32,6 @@
 
 menu "Timer Configuration"
 
-config HPET_TIMER
-	bool "HPET timer"
-	default n
-	help
-	This option selects High Precision Event Timer (HPET) as a
-	system timer.
-
 config LOAPIC_TIMER
 	bool "LOAPIC timer"
 	depends on LOAPIC && BSP_GENERIC_PC
diff --git a/arch/x86/timer/Makefile b/arch/x86/timer/Makefile
index b004d8fde8a..b73da1e5f8b 100644
--- a/arch/x86/timer/Makefile
+++ b/arch/x86/timer/Makefile
@@ -2,5 +2,4 @@ ccflags-y +=-I$(srctree)/include/drivers
 ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
 ccflags-y +=-I$(srctree)/arch/x86
 
-obj-$(CONFIG_HPET_TIMER) += hpet.o
 obj-$(CONFIG_LOAPIC_TIMER) += loApicTimer.o
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index 50e946fe641..b293b6e7d1c 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -30,9 +30,22 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+
+menu "Timer Drivers"
+
+config HPET_TIMER
+	bool "HPET timer"
+	default n
+        depends on X86_32
+	help
+	This option selects High Precision Event Timer (HPET) as a
+	system timer.
+
 config PIT
 	bool "PIT (i8253)"
 	default n
-	depends on ARCH="x86"
+        depends on X86_32
 	help
 	This option selects legacy i8253 timer as system timer.
+
+endmenu
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile
index 4a5d32be0c8..c2a99d488be 100644
--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -1,4 +1,5 @@
 ccflags-y +=-I$(srctree)/arch/$(ARCH)
-ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
+ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR))
 
 obj-$(CONFIG_PIT) = i8253.o
+obj-$(CONFIG_HPET_TIMER) += hpet.o
diff --git a/arch/x86/timer/hpet.c b/drivers/timer/hpet.c
similarity index 100%
rename from arch/x86/timer/hpet.c
rename to drivers/timer/hpet.c