aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward O'Callaghan <eocallaghan@alterapraxis.com>2014-06-26 18:09:34 +1000
committerEdward O'Callaghan <eocallaghan@alterapraxis.com>2014-06-29 09:05:27 +0200
commit95b0c3d75a40cea40a15e8f7d6f56af2ebe2db77 (patch)
tree24fbe4eea14454743ad736cb79d8903fba441d86
parent44fd0a00318a6408f77ace75ed09628eba50c0a4 (diff)
arch/x86/include/bootblock_common.h: Sanitize header inclusion
Sanitize the inclusion of mc146818rtc.h in bootblock_common.h Change-Id: I37d9ffd1375aedbf1f3eaa4ddce27e16166ce0b9 Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-on: http://review.coreboot.org/6119 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/arch/x86/include/bootblock_common.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/arch/x86/include/bootblock_common.h b/src/arch/x86/include/bootblock_common.h
index 4926086bce..276b514b31 100644
--- a/src/arch/x86/include/bootblock_common.h
+++ b/src/arch/x86/include/bootblock_common.h
@@ -1,5 +1,6 @@
-#include <cpu/x86/lapic/boot_cpu.c>
#include <arch/cbfs.h>
+#include <cpu/x86/lapic/boot_cpu.c>
+#include <pc80/mc146818rtc.h>
#ifdef CONFIG_BOOTBLOCK_CPU_INIT
#include CONFIG_BOOTBLOCK_CPU_INIT
@@ -29,8 +30,6 @@ static void bootblock_mainboard_init(void)
#endif
#if CONFIG_USE_OPTION_TABLE
-#include <pc80/mc146818rtc.h>
-
static void sanitize_cmos(void)
{
if (cmos_error() || !cmos_chksum_valid()) {
@@ -48,8 +47,6 @@ static void sanitize_cmos(void)
#endif
#if CONFIG_CMOS_POST
-#include <pc80/mc146818rtc.h>
-
static void cmos_post_init(void)
{
u8 magic = CMOS_POST_BANK_0_MAGIC;