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>
This commit is contained in:
parent
ea2900bd6c
commit
817149643c
|
@ -321,11 +321,6 @@ config HAVE_HARD_RESET
|
||||||
This variable specifies whether a given board has a 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.
|
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
|
config HAVE_MONOTONIC_TIMER
|
||||||
def_bool n
|
def_bool n
|
||||||
help
|
help
|
||||||
|
|
|
@ -6,7 +6,6 @@ if CPU_ALLWINNER_A10
|
||||||
|
|
||||||
config CPU_SPECIFIC_OPTIONS
|
config CPU_SPECIFIC_OPTIONS
|
||||||
def_bool y
|
def_bool y
|
||||||
select HAVE_INIT_TIMER
|
|
||||||
select HAVE_MONOTONIC_TIMER
|
select HAVE_MONOTONIC_TIMER
|
||||||
select HAVE_UART_SPECIAL
|
select HAVE_UART_SPECIAL
|
||||||
select BOOTBLOCK_CONSOLE
|
select BOOTBLOCK_CONSOLE
|
||||||
|
|
|
@ -45,10 +45,6 @@ config XIP_ROM_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x80000
|
default 0x80000
|
||||||
|
|
||||||
config HAVE_INIT_TIMER
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
config REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL
|
config REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL
|
||||||
bool "Redirect AGESA IDS_HDT_CONSOLE to serial console"
|
bool "Redirect AGESA IDS_HDT_CONSOLE to serial console"
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -57,8 +57,4 @@ config XIP_ROM_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x80000
|
default 0x80000
|
||||||
|
|
||||||
config HAVE_INIT_TIMER
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -57,10 +57,6 @@ config XIP_ROM_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x80000
|
default 0x80000
|
||||||
|
|
||||||
config HAVE_INIT_TIMER
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
config HIGH_SCRATCH_MEMORY_SIZE
|
config HIGH_SCRATCH_MEMORY_SIZE
|
||||||
hex
|
hex
|
||||||
# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
|
# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
|
||||||
|
|
|
@ -66,10 +66,6 @@ config XIP_ROM_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x80000
|
default 0x80000
|
||||||
|
|
||||||
config HAVE_INIT_TIMER
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
config REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL
|
config REDIRECT_IDS_HDT_CONSOLE_TO_SERIAL
|
||||||
bool "Redirect AGESA IDS_HDT_CONSOLE to serial console"
|
bool "Redirect AGESA IDS_HDT_CONSOLE to serial console"
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -57,10 +57,6 @@ config XIP_ROM_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x100000
|
default 0x100000
|
||||||
|
|
||||||
config HAVE_INIT_TIMER
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
config HIGH_SCRATCH_MEMORY_SIZE
|
config HIGH_SCRATCH_MEMORY_SIZE
|
||||||
hex
|
hex
|
||||||
# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
|
# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
|
||||||
|
|
|
@ -61,10 +61,6 @@ config XIP_ROM_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x100000
|
default 0x100000
|
||||||
|
|
||||||
config HAVE_INIT_TIMER
|
|
||||||
bool
|
|
||||||
default y
|
|
||||||
|
|
||||||
config HIGH_SCRATCH_MEMORY_SIZE
|
config HIGH_SCRATCH_MEMORY_SIZE
|
||||||
hex
|
hex
|
||||||
# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
|
# Assume the maximum size of stack as (0xA0000 - 0x30000 + 0x1000)
|
||||||
|
|
|
@ -11,7 +11,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select UDELAY_TSC
|
select UDELAY_TSC
|
||||||
select TSC_CONSTANT_RATE
|
select TSC_CONSTANT_RATE
|
||||||
select SMM_TSEG
|
select SMM_TSEG
|
||||||
select HAVE_INIT_TIMER
|
|
||||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||||
#select AP_IN_SIPI_WAIT
|
#select AP_IN_SIPI_WAIT
|
||||||
select TSC_SYNC_MFENCE
|
select TSC_SYNC_MFENCE
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
#include <arch/io.h>
|
#include <arch/io.h>
|
||||||
#include <delay.h>
|
#include <delay.h>
|
||||||
|
|
||||||
|
void init_timer(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void udelay(unsigned usecs)
|
void udelay(unsigned usecs)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
#ifndef DELAY_H
|
#ifndef DELAY_H
|
||||||
#define DELAY_H
|
#define DELAY_H
|
||||||
|
|
||||||
#if CONFIG_HAVE_INIT_TIMER
|
|
||||||
void init_timer(void);
|
void init_timer(void);
|
||||||
#else
|
|
||||||
#define init_timer() do{} while(0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void udelay(unsigned usecs);
|
void udelay(unsigned usecs);
|
||||||
void mdelay(unsigned msecs);
|
void mdelay(unsigned msecs);
|
||||||
|
|
|
@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
||||||
select MAINBOARD_HAS_CHROMEOS
|
select MAINBOARD_HAS_CHROMEOS
|
||||||
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
select MAINBOARD_HAS_NATIVE_VGA_INIT
|
||||||
select MAINBOARD_DO_NATIVE_VGA_INIT
|
select MAINBOARD_DO_NATIVE_VGA_INIT
|
||||||
select HAVE_INIT_TIMER
|
|
||||||
select DRIVER_PARADE_PS8625
|
select DRIVER_PARADE_PS8625
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
Loading…
Reference in New Issue