Update the timer name and Kconfig

riscvarchive · Jun 26, 2017 · 345d431 · 345d431
1 parent d97bf5c
commit 345d431
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
@@ -612,9 +612,9 @@ config CLKSRC_ST_LPC
 	  Enable this option to use the Low Power controller timer
 	  as clocksource.
 
-config CLKSRC_RISCV
-	bool "Clocksource for the RISC-V platform"
-	def_bool RISCV
+config RISCV_TIMER
+	bool "Timer for the RISC-V platform" if COMPILE_TEST
+	depends on RISCV
 	help
 	  This enables a clocksource based on the RISC-V SBI timer, which is
 	  built in to all RISC-V systems.

diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
@@ -73,4 +73,4 @@ obj-$(CONFIG_H8300_TMR16)		+= h8300_timer16.o
 obj-$(CONFIG_H8300_TPU)			+= h8300_tpu.o
 obj-$(CONFIG_CLKSRC_ST_LPC)		+= clksrc_st_lpc.o
 obj-$(CONFIG_X86_NUMACHIP)		+= numachip.o
-obj-$(CONFIG_CLKSRC_RISCV)		+= timer-riscv.o
+obj-$(CONFIG_RISCV_TIMER)		+= riscv_timer.o
diff --git a/drivers/clocksource/timer-riscv.c → drivers/clocksource/riscv_timer.c b/drivers/clocksource/timer-riscv.c → drivers/clocksource/riscv_timer.c