aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2013-10-09 23:45:07 -0700
committerIsaac Christensen <isaac.christensen@se-eng.com>2014-09-10 19:42:41 +0200
commit8932f11c91d9f8b80af562936c8b5c82af9a3c29 (patch)
treec9ef81b341b75bcc197aaa24efbba52e156ba2c6 /src
parent58f306258067f1df231d9c01a60930c2ee815dbc (diff)
downloadcoreboot-8932f11c91d9f8b80af562936c8b5c82af9a3c29.tar.gz
coreboot-8932f11c91d9f8b80af562936c8b5c82af9a3c29.tar.xz
coreboot-8932f11c91d9f8b80af562936c8b5c82af9a3c29.zip
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> Reviewed-on: http://review.coreboot.org/6862 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/soc/nvidia/tegra124/Makefile.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc
index b1f59988e..1a0405158 100644
--- a/src/soc/nvidia/tegra124/Makefile.inc
+++ b/src/soc/nvidia/tegra124/Makefile.inc
@@ -9,17 +9,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/