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>
diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/smihandler.c
index 6acd07c..85a4f47 100644
--- a/src/soc/intel/broadwell/smihandler.c
+++ b/src/soc/intel/broadwell/smihandler.c
@@ -20,7 +20,6 @@
#include <delay.h>
#include <types.h>
-#include <arch/hlt.h>
#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/cache.h>
@@ -28,6 +27,7 @@
#include <cpu/x86/smm.h>
#include <spi-generic.h>
#include <elog.h>
+#include <halt.h>
#include <pc80/mc146818rtc.h>
#include <broadwell/lpc.h>
#include <broadwell/nvs.h>
@@ -197,7 +197,7 @@
/* Make sure to stop executing code here for S3/S4/S5 */
if (slp_typ > 1)
- hlt();
+ halt();
/*
* In most sleep states, the code flow of this function ends at