Isaac Christensen (isaac.christensen@se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6862
-gerrit
commit 7e3c16c7248fe326814af2a0c1d7961083c1952f Author: Gabe Black gabeblack@google.com Date: Wed Oct 9 23:45:07 2013 -0700
tegra124: Make tegra124 compilable with serial turned off.
The bootblock and romstage UART consoles were being built in based only on whether or not the bootblock and romstage consoles were selected, ignoring whether serial console support was compiled in generally.
Change-Id: I3866519c422a990c44ced66885108eff24894563 Signed-off-by: Gabe Black gabeblack@google.com Reviewed-on: https://chromium-review.googlesource.com/172580 Reviewed-by: Ronald Minnich rminnich@chromium.org Commit-Queue: Gabe Black gabeblack@chromium.org Tested-by: Gabe Black gabeblack@chromium.org (cherry picked from commit a4f2dd4902a05884693e6e350b6be29276d16981) Signed-off-by: Isaac Christensen isaac.christensen@se-eng.com --- src/soc/nvidia/tegra124/Makefile.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc index a63eb35..4530ed6 100644 --- a/src/soc/nvidia/tegra124/Makefile.inc +++ b/src/soc/nvidia/tegra124/Makefile.inc @@ -11,17 +11,19 @@ bootblock-y += ../tegra/i2c.c bootblock-y += ../tegra/pingroup.c bootblock-y += ../tegra/pinmux.c bootblock-y += timer.c -bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c +ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) +bootblock-$(CONFIG_CONSOLE_SERIAL) += uart.c +endif
romstage-y += cbfs.c romstage-y += monotonic_timer.c romstage-y += timer.c -romstage-y += uart.c +romstage-$(CONFIG_CONSOLE_SERIAL) += uart.c
ramstage-y += cbfs.c ramstage-y += monotonic_timer.c ramstage-y += timer.c -ramstage-y += uart.c +ramstage-$(CONFIG_CONSOLE_SERIAL) += uart.c
CPPFLAGS_common += -Isrc/soc/nvidia/tegra124/include/