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/sandybridge | |
| parent | 24cca75b47f516e2ad226c37da1e71aef5036fce (diff) | |
| download | coreboot-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/sandybridge')
| -rw-r--r-- | src/northbridge/intel/sandybridge/raminit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c index d2ae4b039e..f6c92dbd11 100644 --- a/src/northbridge/intel/sandybridge/raminit.c +++ b/src/northbridge/intel/sandybridge/raminit.c @@ -21,7 +21,6 @@ #include <console/usb.h> #include <bootmode.h> #include <string.h> -#include <arch/hlt.h> #include <arch/io.h> #include <cbmem.h> #include <arch/cbfs.h> @@ -29,6 +28,7 @@ #include <ip_checksum.h> #include <pc80/mc146818rtc.h> #include <device/pci_def.h> +#include <halt.h> #include "raminit.h" #include "pei_data.h" #include "sandybridge.h" @@ -239,7 +239,7 @@ void sdram_initialize(struct pei_data *pei_data) if (pei_data->boot_mode == 2 && !pei_data->mrc_input) { printk(BIOS_DEBUG, "Giving up in sdram_initialize: No MRC data\n"); outb(0x6, 0xcf9); - hlt(); + halt(); } /* Pass console handler in pei_data */ |