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.

BRANCH=none
BUG=none
TEST=boot tested on pit

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>
This commit is contained in:
Stefan Reinauer 2013-09-10 10:58:28 -07:00 committed by chrome-internal-fetch
commit 855da1f07b
4 changed files with 7 additions and 7 deletions

View file

@ -15,8 +15,8 @@ romstage-y += post.c
romstage-y += die.c
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c
bootblock-y += console.c
bootblock-y += die.c
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += console.c
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += die.c
ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c