GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timestamp: remove conditional #if CONFIG_COLLECT_TIMESTAMPS 

Empty functions are provided when !CONFIG_COLLECT_TIMESTAMPS
so stop guarding the compilation.

BUG=None
BRANCH=None
TEST=Built

Original-Change-Id: Ib0f23e1204e048a9b928568da02e9661f6aa0a35
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/228190
Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>

(cherry picked from commit 9aa69fd43d77f5f7acdc9f361016c595dd16104e)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>

Change-Id: I14418c8ef3ccb57ac6fce05b422e1c21b1d38392
Reviewed-on: http://review.coreboot.org/10742
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Aaron Durbin 2014-11-06 09:58:07 -06:00 committed by Patrick Georgi
parent 3957ddc414
commit 06f1f8fed6
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arch/x86/boot/acpi.c
View File

@ -34,9 +34,7 @@
#include <cpu/x86/lapic_def.h> #include <cpu/x86/lapic_def.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cbfs.h> #include <cbfs.h>
#if CONFIG_COLLECT_TIMESTAMPS
#include <timestamp.h> #include <timestamp.h>
#endif
#include <romstage_handoff.h> #include <romstage_handoff.h>
/* FIXME: Kconfig doesn't support overridable defaults :-( */ /* FIXME: Kconfig doesn't support overridable defaults :-( */
@ -1124,9 +1122,7 @@ void acpi_jump_to_wakeup(void *vector)
/* Copy wakeup trampoline in place. */ /* Copy wakeup trampoline in place. */
memcpy((void *)WAKEUP_BASE, &__wakeup, __wakeup_size); memcpy((void *)WAKEUP_BASE, &__wakeup, __wakeup_size);
#if CONFIG_COLLECT_TIMESTAMPS
timestamp_add_now(TS_ACPI_WAKE_JUMP); timestamp_add_now(TS_ACPI_WAKE_JUMP);
#endif
acpi_do_wakeup((u32)vector, acpi_backup_memory, CONFIG_RAMBASE, acpi_do_wakeup((u32)vector, acpi_backup_memory, CONFIG_RAMBASE,
HIGH_MEMORY_SAVE); HIGH_MEMORY_SAVE);

3
src/southbridge/intel/bd82x6x/bootblock.c
View File

@ -86,9 +86,8 @@ static void set_spi_speed(void)
static void bootblock_southbridge_init(void) static void bootblock_southbridge_init(void)
{ {
#if CONFIG_COLLECT_TIMESTAMPS
store_initial_timestamp(); store_initial_timestamp();
#endif
enable_spi_prefetch(); enable_spi_prefetch();
enable_port80_on_lpc(); enable_port80_on_lpc();
set_spi_speed(); set_spi_speed();

3
src/southbridge/intel/fsp_bd82x6x/bootblock.c
View File

@ -87,9 +87,8 @@ static void set_spi_speed(void)
static void bootblock_southbridge_init(void) static void bootblock_southbridge_init(void)
{ {
#if CONFIG_COLLECT_TIMESTAMPS
store_initial_timestamp(); store_initial_timestamp();
#endif
enable_spi_prefetch(); enable_spi_prefetch();
enable_port80_on_lpc(); enable_port80_on_lpc();
set_spi_speed(); set_spi_speed();

3
src/southbridge/intel/i82801gx/bootblock.c
View File

@ -47,9 +47,8 @@ static void enable_spi_prefetch(void)
static void bootblock_southbridge_init(void) static void bootblock_southbridge_init(void)
{ {
#if CONFIG_COLLECT_TIMESTAMPS
store_initial_timestamp(); store_initial_timestamp();
#endif
enable_spi_prefetch(); enable_spi_prefetch();
/* Enable RCBA */ /* Enable RCBA */

3
src/southbridge/intel/lynxpoint/bootblock.c
View File

@ -87,9 +87,8 @@ static void set_spi_speed(void)
static void bootblock_southbridge_init(void) static void bootblock_southbridge_init(void)
{ {
#if CONFIG_COLLECT_TIMESTAMPS
store_initial_timestamp(); store_initial_timestamp();
#endif
map_rcba(); map_rcba();
enable_spi_prefetch(); enable_spi_prefetch();
enable_port80_on_lpc(); enable_port80_on_lpc();