[coreboot-gerrit] New patch to review for coreboot: google/gru: Change UART _Static_assert() condition to #if

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15810

-gerrit

commit 83374e1a6dfed0f9f1da8f889effc21329ecf233
Author: Julius Werner <jwerner at chromium.org>
Date:   Mon Jul 18 18:21:25 2016 -0700

    google/gru: Change UART _Static_assert() condition to #if
    
    _Static_assert() gets evaluated even when the code path it's in is
    unreachable (e.g. inside an if (0) block). Unfortunately, Kconfigs that
    depend on a disabled Kconfig are always 0, meaning that
    CONFIG_CONSOLE_SERIAL_UART_ADDRESS on Gru cannot evaluate to UART2 when
    CONFIG_CONSOLE_SERIAL (which it depends on) is disabled. Switch the
    condition it is wrapped in to a preprocessor #if so that the
    _Static_assert() is not evaluated when building without serial support.
    
    BRANCH=None
    BUG=None
    TEST=Built and booted Kevin without serial
    
    Change-Id: I391325fcc4b7d64b4866a7fce4444e2f28365b7d
    Signed-off-by: Martin Roth <martinroth at chromium.org>
    Original-Commit-Id: f5e5cf0644154eca5b347ea381df3f6b28287524
    Original-Change-Id: I33d51d4ef09b218c14173d39a12795f0cef6bb40
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/361581
    Original-Reviewed-by: Vadim Bendebury <vbendeb at chromium.org>
---
 src/mainboard/google/gru/bootblock.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c
index 0e485cf..2033495 100644
--- a/src/mainboard/google/gru/bootblock.c
+++ b/src/mainboard/google/gru/bootblock.c
@@ -45,16 +45,16 @@ void bootblock_mainboard_early_init(void)
 	gpio_output(GPIO(0, B, 2), 1);  /* PP1500_EN */
 	gpio_output(GPIO(0, B, 4), 1);  /* PP3000_EN */
 
-	if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
-		_Static_assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE,
-			       "CONSOLE_SERIAL_UART should be UART2");
+#if IS_ENABLED(CONFIG_DRIVERS_UART)
+	_Static_assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE,
+		       "CONSOLE_SERIAL_UART should be UART2");
 
-		/* iomux: select gpio4c[4:3] as uart2 dbg port */
-		write32(&rk3399_grf->iomux_uart2c, IOMUX_UART2C);
+	/* iomux: select gpio4c[4:3] as uart2 dbg port */
+	write32(&rk3399_grf->iomux_uart2c, IOMUX_UART2C);
 
-		/* grf soc_con7[11:10] use for uart2 select */
-		write32(&rk3399_grf->soc_con7, UART2C_SEL);
-	}
+	/* grf soc_con7[11:10] use for uart2 select */
+	write32(&rk3399_grf->soc_con7, UART2C_SEL);
+#endif
 }
 
 void bootblock_mainboard_init(void)