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/southbridge/intel/bd82x6x/early_me_native.c | |
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/southbridge/intel/bd82x6x/early_me_native.c')
-rw-r--r-- | src/southbridge/intel/bd82x6x/early_me_native.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/southbridge/intel/bd82x6x/early_me_native.c b/src/southbridge/intel/bd82x6x/early_me_native.c index f327aec8c5..15e40871a9 100644 --- a/src/southbridge/intel/bd82x6x/early_me_native.c +++ b/src/southbridge/intel/bd82x6x/early_me_native.c @@ -19,11 +19,11 @@ * MA 02110-1301 USA */ -#include <arch/hlt.h> #include <arch/io.h> #include <console/console.h> #include <delay.h> #include <device/pci_ids.h> +#include <halt.h> #include <string.h> #include "me.h" #include "pch.h" @@ -184,7 +184,7 @@ int intel_early_me_init_done(u8 status) pcie_write_config16(PCI_DEV(0, 31, 0), 0xa2, reg16); set_global_reset(0); outb(0x6, 0xcf9); - hlt(); + halt(); } if (((me_fws2 & 0x10) == 0x10) && (me_fws2 & 0x80) == 0x00) { @@ -266,7 +266,7 @@ int intel_early_me_init_done(u8 status) /* Perform the requested reset */ if (reset) { outb(reset, 0xcf9); - hlt(); + halt(); } return -1; } |