aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/x86/init
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2011-04-16 00:09:53 +0000
committerStefan Reinauer <stepan@openbios.org>2011-04-16 00:09:53 +0000
commita7163f1eb9a5461ba7a59c946d841a2b77b4932f (patch)
treea6f6d3fabb3f7beef7fc24ad77013fa17f40e21b /src/arch/x86/init
parent6aef5542f8f4c61c571055fe675170fa0d4deaa5 (diff)
downloadcoreboot-a7163f1eb9a5461ba7a59c946d841a2b77b4932f.tar.gz
coreboot-a7163f1eb9a5461ba7a59c946d841a2b77b4932f.tar.xz
coreboot-a7163f1eb9a5461ba7a59c946d841a2b77b4932f.zip
bootblock updates:
- allow CPU to define bootblock code, too. - drop unneeded __PRE_RAM__ define - move CBFS specific code out of bootblock_common.h into cbfs.h Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Acked-by: Marc Jones <marcj303@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/x86/init')
-rw-r--r--src/arch/x86/init/bootblock_normal.c1
-rw-r--r--src/arch/x86/init/bootblock_simple.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c
index 99551484a..db9d0f955 100644
--- a/src/arch/x86/init/bootblock_normal.c
+++ b/src/arch/x86/init/bootblock_normal.c
@@ -6,6 +6,7 @@ static void main(unsigned long bist)
if (boot_cpu()) {
bootblock_northbridge_init();
bootblock_southbridge_init();
+ bootblock_cpu_init();
}
#if CONFIG_USE_OPTION_TABLE
diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c
index 3887b97c5..5d7c611aa 100644
--- a/src/arch/x86/init/bootblock_simple.c
+++ b/src/arch/x86/init/bootblock_simple.c
@@ -5,6 +5,7 @@ static void main(unsigned long bist)
if (boot_cpu()) {
bootblock_northbridge_init();
bootblock_southbridge_init();
+ bootblock_cpu_init();
}
#if CONFIG_USE_OPTION_TABLE