summaryrefslogtreecommitdiff
path: root/src/northbridge/intel/i5000/raminit.c
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/northbridge/intel/i5000/raminit.c
parent24cca75b47f516e2ad226c37da1e71aef5036fce (diff)
downloadcoreboot-546953c0c553465761705fb0747964c08d634461.tar.xz
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/northbridge/intel/i5000/raminit.c')
-rw-r--r--src/northbridge/intel/i5000/raminit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/northbridge/intel/i5000/raminit.c b/src/northbridge/intel/i5000/raminit.c
index 9c694c7d28..539400293b 100644
--- a/src/northbridge/intel/i5000/raminit.c
+++ b/src/northbridge/intel/i5000/raminit.c
@@ -26,6 +26,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/intel/speedstep.h>
#include <console/console.h>
+#include <halt.h>
#include <spd.h>
#include <types.h>
#include <string.h>
@@ -1522,7 +1523,7 @@ static void i5000_try_restart(const char *msg)
printk(BIOS_INFO, "%s", msg);
i5000_dump_error_registers();
outb(0x06, 0xcf9);
- for(;;) asm volatile("hlt");
+ halt();
}
static void i5000_pam_setup(void)
@@ -1624,7 +1625,7 @@ static int i5000_setup_clocking(struct i5000_fbd_setup *setup)
pci_write_config8(PCI_ADDR(0, 16, 1, 0), 0x56, ddrfrq);
/* FSB:FBD mapping changed, needs hard reset */
outb(0x06, 0xcf9);
- for(;;) asm volatile("hlt");
+ halt();
}
return 0;
}