aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/x86/init
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2014-11-29 10:38:17 +0100
committerPatrick Georgi <pgeorgi@google.com>2014-12-02 10:25:55 +0100
commit546953c0c553465761705fb0747964c08d634461 (patch)
tree6cbd36b46d1230bb36a557849ac9e711a16917f1 /src/arch/x86/init
parent24cca75b47f516e2ad226c37da1e71aef5036fce (diff)
downloadcoreboot-546953c0c553465761705fb0747964c08d634461.tar.gz
coreboot-546953c0c553465761705fb0747964c08d634461.tar.xz
coreboot-546953c0c553465761705fb0747964c08d634461.zip
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 <pgeorgi@google.com> Reviewed-on: http://review.coreboot.org/7608 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/arch/x86/init')
-rw-r--r--src/arch/x86/init/bootblock_normal.c3
-rw-r--r--src/arch/x86/init/bootblock_simple.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c
index 218d456ad..bde2535ba 100644
--- a/src/arch/x86/init/bootblock_normal.c
+++ b/src/arch/x86/init/bootblock_normal.c
@@ -1,6 +1,7 @@
#include <smp/node.h>
#include <bootblock_common.h>
#include <pc80/mc146818rtc.h>
+#include <halt.h>
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 179595a72..adeecf7ba 100644
--- a/src/arch/x86/init/bootblock_simple.c
+++ b/src/arch/x86/init/bootblock_simple.c
@@ -1,5 +1,6 @@
#include <smp/node.h>
#include <bootblock_common.h>
+#include <halt.h>
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();
}