[coreboot-gerrit] Patch merged into coreboot/master: 9125d88 console: conditionally include console in bootblock

the following patch was just integrated into master:
commit 9125d88596181549f9cd7988c6dd748d54b299ee
Author: Stefan Reinauer 
Date:   Tue Sep 10 10:58:28 2013 -0700

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 
    Reviewed-on: https://chromium-review.googlesource.com/168772
    Reviewed-by: David Hendrix 
    (cherry picked from commit 855da1f07b52898c7edcaffe5baabe9d485bbd83)
    Signed-off-by: Isaac Christensen 
    Reviewed-on: http://review.coreboot.org/6637
    Tested-by: build bot (Jenkins)
    Reviewed-by: David Hendricks

See http://review.coreboot.org/6637 for details.

-gerrit