summaryrefslogtreecommitdiff
path: root/arch/x86/cpu
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-04-17 16:13:35 +0000
committerSimon Glass <sjg@chromium.org>2013-05-13 13:33:20 -0700
commit7949703a9582ec60cf841c595acd3bbe86933cd3 (patch)
treebff2cc44633f3bee735346733574c7fb87deb6c3 /arch/x86/cpu
parentc78a62acdfbc0a1cc75ee934f7897b9e99bd3e8d (diff)
downloadu-boot-imx-7949703a9582ec60cf841c595acd3bbe86933cd3.zip
u-boot-imx-7949703a9582ec60cf841c595acd3bbe86933cd3.tar.gz
u-boot-imx-7949703a9582ec60cf841c595acd3bbe86933cd3.tar.bz2
x86: Rationalise kernel booting logic and bootstage
The 'Starting linux' message appears twice in the code, but both call through the same place. Unify these and add calls to bootstage to mark the occasion. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Michael Spang <spang@chromium.org> Acked-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'arch/x86/cpu')
-rw-r--r--arch/x86/cpu/cpu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 1a2f85c..7a914a5 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -120,6 +120,11 @@ void setup_gdt(gd_t *id, u64 *gdt_addr)
int __weak x86_cleanup_before_linux(void)
{
+#ifdef CONFIG_BOOTSTAGE_STASH
+ bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH,
+ CONFIG_BOOTSTAGE_STASH_SIZE);
+#endif
+
return 0;
}