Get rid of HAVE_INIT_TIMER config option

There is redundancy in terms of use of init_timer. We have a Kconfig option to
decide whether a board has init_timer as well as we use a stub for init_timer in
places where we do not have any init_timer defined. Thus, remove the Kconfig
option. Henceforth, all boards that do not have init_timer functionality can
include a stub_timer if required.

Change-Id: I35d38ec686f4dc92861cf9248f9b540323cd98ae
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: http://review.coreboot.org/5569
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

12 files changed, 4 insertions, 36 deletions

diff --git a/src/Kconfig b/src/Kconfig
index 27f532b44e..e1d2e7ac36 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -321,11 +321,6 @@ config HAVE_HARD_RESET
 	  This variable specifies whether a given board has a hard_reset
 	  function, no matter if it's provided by board code or chipset code.
 
-config HAVE_INIT_TIMER
-	bool
-	default n if UDELAY_IO
-	default y
-
 config HAVE_MONOTONIC_TIMER
 	def_bool n
 	help
diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig
index 8512c38511..267e1f48f2 100644
--- a/src/cpu/allwinner/a10/Kconfig
+++ b/src/cpu/allwinner/a10/Kconfig
@@ -6,7 +6,6 @@ if CPU_ALLWINNER_A10
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select HAVE_INIT_TIMER
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_UART_SPECIAL
 	select BOOTBLOCK_CONSOLE
diff --git a/src/cpu/amd/agesa/family10/Kconfig b/src/cpu/amd/agesa/family10/Kconfig
index 621ee5813e..97802c7e78 100644
--- a/src/cpu/amd/agesa/family10/Kconfig
+++ b/src/cpu/amd/agesa/family10/Kconfig
@@ -45,10 +45,6 @@ config XIP_ROM_SIZE
 	hex
 	default 0x80000
 
-config HAVE_INIT_TIMER
-	bool
-	default y
-
 config REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL
         bool "Redirect AGESA IDS_HDT_CONSOLE to serial console"
         default n
diff --git a/src/cpu/amd/agesa/family12/Kconfig b/src/cpu/amd/agesa/family12/Kconfig
index 757db9a20c..111a93e308 100644
--- a/src/cpu/amd/agesa/family12/Kconfig
+++ b/src/cpu/amd/agesa/family12/Kconfig
@@ -57,8 +57,4 @@ config XIP_ROM_SIZE
 	hex
 	default 0x80000
 
-config HAVE_INIT_TIMER
-	bool
-	default y
-
 endif
diff --git a/src/cpu/amd/agesa/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index 7acd520a2b..4ff277f547 100644
--- a/src/cpu/amd/agesa/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -57,10 +57,6 @@ config XIP_ROM_SIZE
 	hex
 	default 0x80000
 
-config HAVE_INIT_TIMER
-	bool
-	default y
-
 config HIGH_SCRATCH_MEMORY_SIZE
 	hex
 	# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
diff --git a/src/cpu/amd/agesa/family15/Kconfig b/src/cpu/amd/agesa/family15/Kconfig
index 02991a04e8..fbd6e3b33d 100644
--- a/src/cpu/amd/agesa/family15/Kconfig
+++ b/src/cpu/amd/agesa/family15/Kconfig
@@ -66,10 +66,6 @@ config XIP_ROM_SIZE
 	hex
 	default 0x80000
 
-config HAVE_INIT_TIMER
-	bool
-	default y
-
 config REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL
         bool "Redirect AGESA IDS_HDT_CONSOLE to serial console"
         default n
diff --git a/src/cpu/amd/agesa/family15tn/Kconfig b/src/cpu/amd/agesa/family15tn/Kconfig
index 9885570d88..b9edc22abc 100644
--- a/src/cpu/amd/agesa/family15tn/Kconfig
+++ b/src/cpu/amd/agesa/family15tn/Kconfig
@@ -57,10 +57,6 @@ config XIP_ROM_SIZE
 	hex
 	default 0x100000
 
-config HAVE_INIT_TIMER
-	bool
-	default y
-
 config HIGH_SCRATCH_MEMORY_SIZE
 	hex
 	# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
diff --git a/src/cpu/amd/agesa/family16kb/Kconfig b/src/cpu/amd/agesa/family16kb/Kconfig
index 9a8bce2ad5..c9f4fb2c5d 100644
--- a/src/cpu/amd/agesa/family16kb/Kconfig
+++ b/src/cpu/amd/agesa/family16kb/Kconfig
@@ -61,10 +61,6 @@ config XIP_ROM_SIZE
 	hex
 	default 0x100000
 
-config HAVE_INIT_TIMER
-	bool
-	default y
-
 config HIGH_SCRATCH_MEMORY_SIZE
 	hex
 	# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig
index 50a7e6c2ad..bbb4eb1b64 100644
--- a/src/cpu/intel/model_2065x/Kconfig
+++ b/src/cpu/intel/model_2065x/Kconfig
@@ -11,7 +11,6 @@ config CPU_SPECIFIC_OPTIONS
 	select UDELAY_TSC
 	select TSC_CONSTANT_RATE
 	select SMM_TSEG
-	select HAVE_INIT_TIMER
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	#select AP_IN_SIPI_WAIT
 	select TSC_SYNC_MFENCE
diff --git a/src/drivers/pc80/udelay_io.c b/src/drivers/pc80/udelay_io.c
index 37f3f73186..48ff32c944 100644
--- a/src/drivers/pc80/udelay_io.c
+++ b/src/drivers/pc80/udelay_io.c
@@ -1,6 +1,10 @@
 #include <arch/io.h>
 #include <delay.h>
 
+void init_timer(void)
+{
+}
+
 void udelay(unsigned usecs)
 {
 	int i;
diff --git a/src/include/delay.h b/src/include/delay.h
index 676579b6ae..b3d8ed95da 100644
--- a/src/include/delay.h
+++ b/src/include/delay.h
@@ -1,11 +1,7 @@
 #ifndef DELAY_H
 #define DELAY_H
 
-#if CONFIG_HAVE_INIT_TIMER
 void init_timer(void);
-#else
-#define init_timer() do{} while(0)
-#endif
 
 void udelay(unsigned usecs);
 void mdelay(unsigned msecs);
diff --git a/src/mainboard/google/pit/Kconfig b/src/mainboard/google/pit/Kconfig
index 1c20015357..e7e9a31004 100644
--- a/src/mainboard/google/pit/Kconfig
+++ b/src/mainboard/google/pit/Kconfig
@@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_DO_NATIVE_VGA_INIT
-	select HAVE_INIT_TIMER
 	select DRIVER_PARADE_PS8625
 
 config MAINBOARD_DIR