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/arch/arm | |
| 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/arch/arm')
| -rw-r--r-- | src/arch/arm/armv4/bootblock_simple.c | 4 | ||||
| -rw-r--r-- | src/arch/arm/armv7/bootblock_simple.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/arm/armv4/bootblock_simple.c b/src/arch/arm/armv4/bootblock_simple.c index 80401b3951..207279b2f6 100644 --- a/src/arch/arm/armv4/bootblock_simple.c +++ b/src/arch/arm/armv4/bootblock_simple.c @@ -20,11 +20,11 @@ */ #include <arch/exception.h> -#include <arch/hlt.h> #include <arch/stages.h> #include <bootblock_common.h> #include <cbfs.h> #include <console/console.h> +#include <halt.h> void main(void) { @@ -42,5 +42,5 @@ void main(void) entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name); if (entry) stage_exit(entry); - hlt(); + halt(); } diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c index 248ea4e2b5..aad63b67f9 100644 --- a/src/arch/arm/armv7/bootblock_simple.c +++ b/src/arch/arm/armv7/bootblock_simple.c @@ -21,11 +21,11 @@ #include <arch/cache.h> #include <arch/exception.h> -#include <arch/hlt.h> #include <arch/stages.h> #include <bootblock_common.h> #include <cbfs.h> #include <console/console.h> +#include <halt.h> #include <smp/node.h> void main(void) @@ -44,5 +44,5 @@ void main(void) entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name); if (entry) stage_exit(entry); - hlt(); + halt(); } |