[coreboot-gerrit] New patch to review for coreboot: 574d906 tegra132: Add proper guards to display code

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9534

-gerrit

commit 574d9067b905332785dd64c3ec69db8ec9acf08c
Author: Furquan Shaikh <furquan at google.com>
Date:   Fri Nov 21 16:27:02 2014 -0800

    tegra132: Add proper guards to display code
    
    Enable display code only if mainboard selects
    MAINBOARD_DO_NATIVE_VGA_INIT. Otherwise build breaks for boards that do not
    support display init yet.
    
    BUG=chrome-os-partner:31936
    BRANCH=None
    TEST=Compiles for both rush and ryu. Display comes up for ryu in both normal and
    dev mode.
    
    Change-Id: I7179236ff1dea609b482317bd3a52b6e7e1e8f2d
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: ce2883b21d3fbfd54eac3a355fb34ec70e9f31ad
    Original-Signed-off-by: Furquan Shaikh <furquan at google.com>
    Original-Change-Id: Ib4a3c32f1ebf5c6ed71c96a24893dcdee7488b16
    Original-Reviewed-on: https://chromium-review.googlesource.com/231545
    Original-Reviewed-by: Tom Warren <twarren at nvidia.com>
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Tested-by: Furquan Shaikh <furquan at chromium.org>
    Original-Commit-Queue: Furquan Shaikh <furquan at chromium.org>
---
 src/soc/nvidia/tegra132/Makefile.inc | 12 ++++++------
 src/soc/nvidia/tegra132/soc.c        |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index a941265..a46a2e5 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -66,12 +66,12 @@ ramstage-y += cbmem.c
 ramstage-y += cpu.c
 ramstage-y += cpu_lib.S
 ramstage-y += clock.c
-ramstage-y += display.c
-ramstage-y += tegra_dsi.c
-ramstage-y += mipi_dsi.c
-ramstage-y += mipi.c
-ramstage-y += mipi-phy.c
-ramstage-y += ./jdi_25x18_display/panel-jdi-lpm102a188a.c
+ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += display.c
+ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += tegra_dsi.c
+ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += mipi_dsi.c
+ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += mipi.c
+ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += mipi-phy.c
+ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ./jdi_25x18_display/panel-jdi-lpm102a188a.c
 
 ramstage-y += soc.c
 ramstage-y += spi.c
diff --git a/src/soc/nvidia/tegra132/soc.c b/src/soc/nvidia/tegra132/soc.c
index 5593be7..a77ffbb 100644
--- a/src/soc/nvidia/tegra132/soc.c
+++ b/src/soc/nvidia/tegra132/soc.c
@@ -87,10 +87,12 @@ static void soc_init(device_t dev)
 	spintable_init((void *)cfg->spintable_addr);
 	arch_initialize_cpus(dev, &cntrl_ops);
 
+#if IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)
 	if (vboot_skip_display_init())
 		printk(BIOS_INFO, "Skipping display init.\n");
 	else
 		display_startup(dev);
+#endif
 }
 
 static struct device_operations soc_ops = {