diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2013-09-10 10:58:28 -0700 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-08-18 19:02:11 +0200 |
| commit | 9125d88596181549f9cd7988c6dd748d54b299ee (patch) | |
| tree | 13e2214e809abd2ec42f26f2bf1c3485ce34e24a /src | |
| parent | e71928ca072b5c136f6d62382182b0b213bd063f (diff) | |
console: conditionally include console in bootblock
Right now some console specific objects are included
in the bootblock even if CONFIG_BOOTBLOCK_CONSOLE is
disabled while others are not. Make all of them conditional
and also fix a preprocessor misuse in bootblock_simple.c
and a stray (useless) die() in the Exynos wakeup code that
made inclusion of those files necessary.
Change-Id: Ia7f9d17654466f199b0e13afbdc9e14c9706530f
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/168772
Reviewed-by: David Hendrix <dhendrix@chromium.org>
(cherry picked from commit 855da1f07b52898c7edcaffe5baabe9d485bbd83)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6637
Tested-by: build bot (Jenkins)
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/console/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/wakeup.c | 4 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5420/wakeup.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index 435d7049ea..c72c60b309 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -13,7 +13,7 @@ romstage-y += die.c bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c printk.c bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += init.c console.c -bootblock-y += die.c +bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += die.c $(obj)/console/init.smm.o : $(obj)/build.h $(obj)/console/init.ramstage.o : $(obj)/build.h diff --git a/src/cpu/samsung/exynos5250/wakeup.c b/src/cpu/samsung/exynos5250/wakeup.c index 5764c83bd6..02f2ccd2db 100644 --- a/src/cpu/samsung/exynos5250/wakeup.c +++ b/src/cpu/samsung/exynos5250/wakeup.c @@ -28,8 +28,8 @@ void wakeup(void) power_init(); /* Ensure ps_hold_setup() for early wakeup. */ power_exit_wakeup(); - /* Should never return. */ - die("Failed to wake up.\n"); + /* Should never return. If we do, reset. */ + power_reset(); } int get_wakeup_state(void) diff --git a/src/cpu/samsung/exynos5420/wakeup.c b/src/cpu/samsung/exynos5420/wakeup.c index af7ef73f89..9d3f065233 100644 --- a/src/cpu/samsung/exynos5420/wakeup.c +++ b/src/cpu/samsung/exynos5420/wakeup.c @@ -31,8 +31,8 @@ void wakeup(void) dcache_mmu_disable(); icache_invalidate_all(); power_exit_wakeup(); - /* Should never return. */ - die("Failed to wake up.\n"); + /* Should never return. If we do, reset. */ + power_reset(); } int get_wakeup_state(void) |