diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-06-17 11:04:37 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-06-18 20:02:26 +0200 |
| commit | e325b223a2c48d35dedce1c20d055c23b0ea4bea (patch) | |
| tree | b2e84bc8d2b9c647a9233bef85c82e370d5e6a40 /src | |
| parent | 5276941c8b9a3294fda4eb5d102c8333688d29a5 (diff) | |
| download | coreboot-e325b223a2c48d35dedce1c20d055c23b0ea4bea.tar.xz | |
intel: Fix romstage main() with asmlinkage
Backport from haswell.
Change-Id: I585639f8af47bd1d8c606789ca026c6d2d0cc785
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15225
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/intel/car/romstage.c | 7 | ||||
| -rw-r--r-- | src/include/cpu/intel/romstage.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/cpu/intel/car/romstage.c b/src/cpu/intel/car/romstage.c new file mode 100644 index 0000000000..c6df446c6a --- /dev/null +++ b/src/cpu/intel/car/romstage.c @@ -0,0 +1,7 @@ +#include <cpu/intel/romstage.h> + +void * asmlinkage romstage_main(unsigned long bist) +{ + mainboard_romstage_entry(bist); + return (void*)CONFIG_RAMTOP; +} diff --git a/src/include/cpu/intel/romstage.h b/src/include/cpu/intel/romstage.h index 0ebb91266b..c294c2edc0 100644 --- a/src/include/cpu/intel/romstage.h +++ b/src/include/cpu/intel/romstage.h @@ -1,7 +1,12 @@ #ifndef _CPU_INTEL_ROMSTAGE_H #define _CPU_INTEL_ROMSTAGE_H +#include <arch/cpu.h> + /* std signature of entry-point to romstage.c */ void main(unsigned long bist); +void mainboard_romstage_entry(unsigned long bist); +void * asmlinkage romstage_main(unsigned long bist); + #endif /* _CPU_INTEL_ROMSTAGE_H */ |