commit a4f2dd4902a05884693e6e350b6be29276d16981
author Gabe Black <gabeblack@google.com> Wed Oct 09 23:45:07 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 11 03:58:38 2013 +0000
tree 1dfe3b4c93c9c9b2ea74027502be86bfba32edd2
parent f0a1366d328f84e720fe7768cecfe57b3e7dca79

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.

BUG=None
TEST=Built for nyan with and without serial.
BRANCH=None

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>

src/soc/nvidia/tegra124/Makefile.inc

diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc
index af39c1f..bba1e36 100644
--- a/src/soc/nvidia/tegra124/Makefile.inc
+++ b/src/soc/nvidia/tegra124/Makefile.inc
@@ -9,12 +9,16 @@
 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) += uart.c
+endif
 
 romstage-y += cbfs.c
 romstage-y += monotonic_timer.c
 romstage-y += timer.c
-romstage-$(CONFIG_EARLY_CONSOLE) += uart.c
+ifeq ($(CONFIG_EARLY_CONSOLE),y)
+romstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c
+endif
 
 ramstage-y += cbfs.c
 ramstage-y += monotonic_timer.c