diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2014-11-28 22:35:36 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-11-30 12:20:07 +0100 |
| commit | bd79c5eaf1f13f33c43c99657f24fa4c0330619a (patch) | |
| tree | c20d6e5e00fcf3494d1c3fdd2d84b97ae34a21ea /src/mainboard/samsung | |
| parent | 1b2f2a071488bd15ce80194e85d318cd44659e54 (diff) | |
Replace hlt() loops with halt()
Change-Id: I8486e70615f4c404a342cb86963b5357a934c41d
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: http://review.coreboot.org/7606
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/mainboard/samsung')
| -rw-r--r-- | src/mainboard/samsung/lumpy/romstage.c | 5 | ||||
| -rw-r--r-- | src/mainboard/samsung/stumpy/romstage.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c index 6595f0d3dd..5b8646a1ce 100644 --- a/src/mainboard/samsung/lumpy/romstage.c +++ b/src/mainboard/samsung/lumpy/romstage.c @@ -40,6 +40,7 @@ #include <arch/cpu.h> #include <cpu/x86/bist.h> #include <cpu/x86/msr.h> +#include <halt.h> #include "option_table.h" #include "gpio.h" #if CONFIG_DRIVERS_UART_8250IO @@ -180,7 +181,7 @@ void main(unsigned long bist) /* System is not happy after keyboard reset... */ printk(BIOS_DEBUG, "Issuing CF9 warm reset\n"); outb(0x6, 0xcf9); - hlt(); + halt(); } /* Perform some early chipset initialization required @@ -270,7 +271,7 @@ void main(unsigned long bist) if (boot_mode == 2 && !cbmem_was_initted) { /* Failed S3 resume, reset to come up cleanly */ outb(0x6, 0xcf9); - hlt(); + halt(); } northbridge_romstage_finalize(boot_mode==2); post_code(0x3f); diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c index 2c651ae799..f842ad2e49 100644 --- a/src/mainboard/samsung/stumpy/romstage.c +++ b/src/mainboard/samsung/stumpy/romstage.c @@ -41,6 +41,7 @@ #include <arch/cpu.h> #include <cpu/x86/bist.h> #include <cpu/x86/msr.h> +#include <halt.h> #include "gpio.h" #if CONFIG_DRIVERS_UART_8250IO #include "superio/smsc/lpc47n207/lpc47n207.h" @@ -218,7 +219,7 @@ void main(unsigned long bist) /* System is not happy after keyboard reset... */ printk(BIOS_DEBUG, "Issuing CF9 warm reset\n"); outb(0x6, 0xcf9); - hlt(); + halt(); } /* Perform some early chipset initialization required @@ -279,7 +280,7 @@ void main(unsigned long bist) if (boot_mode==2 && !cbmem_was_initted) { /* Failed S3 resume, reset to come up cleanly */ outb(0x6, 0xcf9); - hlt(); + halt(); } northbridge_romstage_finalize(boot_mode==2); |