From a7163f1eb9a5461ba7a59c946d841a2b77b4932f Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sat, 16 Apr 2011 00:09:53 +0000 Subject: 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 Acked-by: Marc Jones git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/x86/init/bootblock_normal.c | 1 + src/arch/x86/init/bootblock_simple.c | 1 + 2 files changed, 2 insertions(+) (limited to 'src/arch/x86/init') diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c index 99551484aa..db9d0f9557 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 3887b97c58..5d7c611aa7 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 -- cgit v1.2.3