diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2014-11-29 10:38:17 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-12-02 10:25:55 +0100 |
| commit | 546953c0c553465761705fb0747964c08d634461 (patch) | |
| tree | 6cbd36b46d1230bb36a557849ac9e711a16917f1 /src/northbridge/intel/i945 | |
| parent | 24cca75b47f516e2ad226c37da1e71aef5036fce (diff) | |
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/i945')
| -rw-r--r-- | src/northbridge/intel/i945/early_init.c | 3 | ||||
| -rw-r--r-- | src/northbridge/intel/i945/raminit.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c index f639aef146..aaa17e503b 100644 --- a/src/northbridge/intel/i945/early_init.c +++ b/src/northbridge/intel/i945/early_init.c @@ -23,6 +23,7 @@ #include <arch/io.h> #include <device/pci_def.h> #include <cbmem.h> +#include <halt.h> #include <string.h> #include "i945.h" @@ -512,7 +513,7 @@ static void i945_setup_dmi_rcrb(void) reg32 |= (3 << 0); DMIBAR32(0x224) = reg32; outb(0x06, 0xcf9); - for (;;) asm("hlt"); /* wait for reset */ + halt(); /* wait for reset */ } } } diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index e823bab455..e9b6e3ffed 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -24,6 +24,7 @@ #include <spd.h> #include <string.h> #include <arch/io.h> +#include <halt.h> #include <lib.h> #include "raminit.h" #include "i945.h" @@ -281,7 +282,7 @@ static void sdram_detect_errors(struct sys_info *sysinfo) printk(BIOS_DEBUG, "Reset required.\n"); outb(0x00, 0xcf9); outb(0x0e, 0xcf9); - for (;;) asm("hlt"); /* Wait for reset! */ + halt(); /* Wait for reset! */ } } @@ -311,7 +312,7 @@ static void sdram_detect_errors(struct sys_info *sysinfo) printk(BIOS_DEBUG, "Reset required.\n"); outb(0x00, 0xcf9); outb(0x0e, 0xcf9); - for (;;) asm("hlt"); /* Wait for reset! */ + halt(); /* Wait for reset! */ } } |