diff options
| -rw-r--r-- | src/cpu/intel/model_2065x/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/cpu/intel/model_2065x/cache_as_ram.inc | 10 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/romstage.c | 4 | ||||
| -rw-r--r-- | src/mainboard/packardbell/ms2290/romstage.c | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/src/cpu/intel/model_2065x/Makefile.inc b/src/cpu/intel/model_2065x/Makefile.inc index a13f5df26d01..cdf9fed3e20d 100644 --- a/src/cpu/intel/model_2065x/Makefile.inc +++ b/src/cpu/intel/model_2065x/Makefile.inc @@ -20,3 +20,4 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c cpu_microcode_bins += 3rdparty/blobs/cpu/intel/model_2065x/microcode.bin cpu_incs-y += $(src)/cpu/intel/model_2065x/cache_as_ram.inc +romstage-y += ../car/romstage.c diff --git a/src/cpu/intel/model_2065x/cache_as_ram.inc b/src/cpu/intel/model_2065x/cache_as_ram.inc index 269fbeffc74e..51af5c69d2f8 100644 --- a/src/cpu/intel/model_2065x/cache_as_ram.inc +++ b/src/cpu/intel/model_2065x/cache_as_ram.inc @@ -170,7 +170,12 @@ clear_var_mtrrs: before_romstage: post_code(0x29) /* Call romstage.c main function. */ - call main + call romstage_main + + /* Save return value from romstage_main. It contains the stack to use + * after cache-as-ram is torn down. + */ + movl %eax, %ebx post_code(0x2f) @@ -272,7 +277,8 @@ __main: post_code(POST_PREPARE_RAMSTAGE) cld /* Clear direction flag. */ - movl $CONFIG_RAMTOP, %esp + /* Setup stack as indicated by return value from romstage_main(). */ + movl %ebx, %esp movl %esp, %ebp call copy_and_run diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c index 53032f63ae99..19b49094fbd1 100644 --- a/src/mainboard/lenovo/x201/romstage.c +++ b/src/mainboard/lenovo/x201/romstage.c @@ -28,6 +28,7 @@ #include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> +#include <cpu/intel/romstage.h> #include <ec/acpi/ec.h> #include <delay.h> #include <timestamp.h> @@ -174,8 +175,7 @@ static void set_fsb_frequency(void) smbus_block_write(0x69, 0, 5, block); } -#include <cpu/intel/romstage.h> -void main(unsigned long bist) +void mainboard_romstage_entry(unsigned long bist) { u32 reg32; int s3resume = 0; diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c index e8f625d97a53..d46a768f4b35 100644 --- a/src/mainboard/packardbell/ms2290/romstage.c +++ b/src/mainboard/packardbell/ms2290/romstage.c @@ -28,12 +28,12 @@ #include <pc80/mc146818rtc.h> #include <console/console.h> #include <cpu/x86/bist.h> +#include <cpu/intel/romstage.h> #include <ec/acpi/ec.h> #include <delay.h> #include <timestamp.h> #include <arch/acpi.h> #include <cbmem.h> -#include <cpu/intel/romstage.h> #include "arch/early_variables.h" #include <southbridge/intel/ibexpeak/pch.h> @@ -166,8 +166,7 @@ static inline u16 read_acpi16(u32 addr) } #endif -#include <cpu/intel/romstage.h> -void main(unsigned long bist) +void mainboard_romstage_entry(unsigned long bist) { u32 reg32; int s3resume = 0; |