From 546953c0c553465761705fb0747964c08d634461 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 29 Nov 2014 10:38:17 +0100 Subject: Replace hlt with halt() There were instances of unneeded arch/hlt.h includes, various hlt() calls that weren't supposed to exit (but might have) and various forms of endless loops around hlt() calls. All these are sorted out now: unnecessary includes are dropped, hlt() is uniformly replaced with halt() (except in assembly, obviously). Change-Id: I3d38fed6e8d67a28fdeb17be803d8c4b62d383c5 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/7608 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Paul Menzel --- src/arch/x86/init/bootblock_normal.c | 3 ++- src/arch/x86/init/bootblock_simple.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (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 218d456ad3..bde2535ba6 100644 --- a/src/arch/x86/init/bootblock_normal.c +++ b/src/arch/x86/init/bootblock_normal.c @@ -1,6 +1,7 @@ #include #include #include +#include static const char *get_fallback(const char *stagelist) { while (*stagelist) stagelist++; @@ -47,5 +48,5 @@ static void main(unsigned long bist) if (entry) call(entry, bist); /* duh. we're stuck */ - asm volatile ("1:\n\thlt\n\tjmp 1b\n\t"); + halt(); } diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c index 179595a727..adeecf7ba6 100644 --- a/src/arch/x86/init/bootblock_simple.c +++ b/src/arch/x86/init/bootblock_simple.c @@ -1,5 +1,6 @@ #include #include +#include static void main(unsigned long bist) { @@ -18,5 +19,5 @@ static void main(unsigned long bist) unsigned long entry; entry = findstage(target1); if (entry) call(entry, bist); - asm volatile ("1:\n\thlt\n\tjmp 1b\n\t"); + halt(); } -- cgit v1.2.3