aboutsummaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/Kconfig2
-rw-r--r--src/arch/x86/bootblock_normal.c2
-rw-r--r--src/arch/x86/bootblock_simple.c2
-rw-r--r--src/arch/x86/include/arch/bootblock_common.h (renamed from src/arch/x86/include/bootblock_common.h)0
4 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 88b259297c..738e7d1c0a 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -24,6 +24,7 @@ config ARCH_BOOTBLOCK_X86_32
bool
default n
select ARCH_X86
+ select BOOTBLOCK_CUSTOM
config ARCH_VERSTAGE_X86_32
bool
@@ -43,6 +44,7 @@ config ARCH_BOOTBLOCK_X86_64
bool
default n
select ARCH_X86
+ select BOOTBLOCK_CUSTOM
config ARCH_VERSTAGE_X86_64
bool
diff --git a/src/arch/x86/bootblock_normal.c b/src/arch/x86/bootblock_normal.c
index a4dc3c4d25..d5f03b7699 100644
--- a/src/arch/x86/bootblock_normal.c
+++ b/src/arch/x86/bootblock_normal.c
@@ -1,5 +1,5 @@
#include <smp/node.h>
-#include <bootblock_common.h>
+#include <arch/bootblock_common.h>
#include <pc80/mc146818rtc.h>
#include <halt.h>
diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c
index bb0591fb53..4bff360a08 100644
--- a/src/arch/x86/bootblock_simple.c
+++ b/src/arch/x86/bootblock_simple.c
@@ -1,5 +1,5 @@
#include <smp/node.h>
-#include <bootblock_common.h>
+#include <arch/bootblock_common.h>
#include <halt.h>
static void main(unsigned long bist)
diff --git a/src/arch/x86/include/bootblock_common.h b/src/arch/x86/include/arch/bootblock_common.h
index 939ba08a67..939ba08a67 100644
--- a/src/arch/x86/include/bootblock_common.h
+++ b/src/arch/x86/include/arch/bootblock_common.h