Daisuke Nojiri (dnojiri@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16746
-gerrit
commit 06700318abc0a640a950fea0fbee7041c1f4f448 Author: Daisuke Nojiri dnojiri@chromium.org Date: Mon Sep 26 10:46:53 2016 -0700
mvmap2315: Skip uart_init when serial is disabled
When coreboot is built with CONFIG_CONSOLE_SERIAL not set, uart_init does not exist, causing compilation to fail. This patch fixes it by skipping uart_init when serial is disabled.
BUG=none BRANCH=none TEST=emerge-rotor coreboot
Change-Id: If7f475eae9008b392f8f1e5cb5568c93113ee3f1 Signed-off-by: Daisuke Nojiri dnojiri@chromium.org --- src/soc/marvell/mvmap2315/bootblock.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/soc/marvell/mvmap2315/bootblock.c b/src/soc/marvell/mvmap2315/bootblock.c index 6b0a333..57fd38c 100644 --- a/src/soc/marvell/mvmap2315/bootblock.c +++ b/src/soc/marvell/mvmap2315/bootblock.c @@ -93,9 +93,11 @@ void bootblock_soc_init(void) printk(BIOS_DEBUG, "Powering up the AP core0.\n"); ap_start((void *)MVMAP2315_ROMSTAGE_BASE);
- /* initializing UART1 to free UART0 to be used by romstage */ - uart_num = 1; - uart_init(uart_num); + /* Initializing UART1 to free UART0 to be used by AP */ + if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) { + uart_num = 1; + uart_init(uart_num); + }
while (read32((void *)MVMAP2315_BOOTBLOCK_CB1) != 0x4) ;