x86: tsc: Move tsc_timer.c to drivers/timer

To group all dm timer drivers together, move tsc timer to
drivers/timer directory.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index d676e2c14f27f61a282adfc1f62972e5558a4eed..cd5ecb60ea44da4b1a8f8d948b7b679dcc756804 100644 (file)
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -34,7 +34,6 @@ obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
 obj-y  += string.o
 obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o
 obj-y  += tables.o
-obj-$(CONFIG_SYS_X86_TSC_TIMER)        += tsc_timer.o
 obj-$(CONFIG_CMD_ZBOOT)        += zimage.o
 obj-$(CONFIG_HAVE_FSP) += fsp/
 

diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index 029af6489540b30a1acb52bf11c3cae2b8e9cd1b..2b10d2bc6c46b01689b5621dc889b2c81ae314c0 100644 (file)
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -23,4 +23,11 @@ config SANDBOX_TIMER
          Select this to enable an emulated timer for sandbox. It gets
          time from host os.
 
+config X86_TSC_TIMER
+       bool "x86 Time-Stamp Counter (TSC) timer support"
+       depends on TIMER && X86
+       default y if X86
+       help
+         Select this to enable Time-Stamp Counter (TSC) timer for x86.
+
 endmenu

diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile
index 300946e8d9e7bb527a54a18dc279d2b04100335a..fe954eca9a5fde08cdb9cb5b017fa8434bb9d79c 100644 (file)
--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -7,3 +7,4 @@
 obj-$(CONFIG_TIMER)            += timer-uclass.o
 obj-$(CONFIG_ALTERA_TIMER)     += altera_timer.o
 obj-$(CONFIG_SANDBOX_TIMER)    += sandbox_timer.o
+obj-$(CONFIG_X86_TSC_TIMER)    += tsc_timer.o

diff --git a/arch/x86/lib/tsc_timer.c b/drivers/timer/tsc_timer.c
similarity index 100%
rename from arch/x86/lib/tsc_timer.c
rename to drivers/timer/tsc_timer.c

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 65d50ca179892c2bd27675c8d05a2bf2ece06c55..70ec1032fd765cebba35013bbb3b49c5627f829a 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -152,8 +152,6 @@
  * CPU Features
  */
 
-#define CONFIG_SYS_X86_TSC_TIMER
-
 #define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MALLOC_LEN                  0x200000