Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13794
-gerrit
commit 398b1924053564d279821290d645525c1c4a880f Author: Aaron Durbin adurbin@chromium.org Date: Wed Feb 24 19:05:04 2016 -0600
mainboard/intel/apollolake_rvp: remove bootblock_mainboard_early_init()
Now that the SoC is configuring the UART pads there's no need to implement bootblock_mainboard_early_init(). Remove it and bootblock.c.
Change-Id: I2ae7ea38351733e1c9757cde20b79e1d19d0c1e5 Signed-off-by: Aaron Durbin adurbin@chromium.org --- src/mainboard/intel/apollolake_rvp/Makefile.inc | 1 - src/mainboard/intel/apollolake_rvp/bootblock.c | 30 ------------------------- 2 files changed, 31 deletions(-)
diff --git a/src/mainboard/intel/apollolake_rvp/Makefile.inc b/src/mainboard/intel/apollolake_rvp/Makefile.inc index 8501868..e69de29 100644 --- a/src/mainboard/intel/apollolake_rvp/Makefile.inc +++ b/src/mainboard/intel/apollolake_rvp/Makefile.inc @@ -1 +0,0 @@ -bootblock-y += bootblock.c diff --git a/src/mainboard/intel/apollolake_rvp/bootblock.c b/src/mainboard/intel/apollolake_rvp/bootblock.c deleted file mode 100644 index c1b7d41..0000000 --- a/src/mainboard/intel/apollolake_rvp/bootblock.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2016 Intel Corp. - * (Written by Andrey Petrov andrey.petrov@intel.com for Intel Corp.) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include <bootblock_common.h> -#include <console/console.h> -#include <soc/gpio.h> -#include <soc/gpio_defs.h> -#include <soc/uart.h> - -static struct pad_config aplk_rvp_gpios[] = { - PAD_CFG_NF(GPIO_46, NATIVE, DEEP, NF1), /* UART2 RX*/ - PAD_CFG_NF(GPIO_47, NATIVE, DEEP, NF1) /* UART2 TX*/ -}; - -void bootblock_mainboard_early_init(void) -{ - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) { - gpio_configure_pads(aplk_rvp_gpios, ARRAY_SIZE(aplk_rvp_gpios)); - lpss_console_uart_init(); - } -}