diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2019-11-12 19:11:50 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-18 11:48:35 +0000 |
| commit | fa5d0f835b1f3bb8907e616913cbf7b91d09ef26 (patch) | |
| tree | af8d33b500b91fa9e2f1a76d9115086644ccf3d2 /src/mainboard/roda | |
| parent | 59eb2fdb6b06618311ef118996ca8c1d28a85ffc (diff) | |
nb/intel/sandybridge: Set up console in bootblock
Change-Id: Ia041b63201b2a4a2fe6ab11e3497c460f88061d1
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36784
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/mainboard/roda')
| -rw-r--r-- | src/mainboard/roda/rv11/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/mainboard/roda/rv11/early_init.c (renamed from src/mainboard/roda/rv11/romstage.c) | 0 | ||||
| -rw-r--r-- | src/mainboard/roda/rv11/variants/rv11/early_init.c (renamed from src/mainboard/roda/rv11/variants/rv11/romstage.c) | 4 | ||||
| -rw-r--r-- | src/mainboard/roda/rv11/variants/rw11/early_init.c (renamed from src/mainboard/roda/rv11/variants/rw11/romstage.c) | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/mainboard/roda/rv11/Makefile.inc b/src/mainboard/roda/rv11/Makefile.inc index 422b448e24..a3d6d5913f 100644 --- a/src/mainboard/roda/rv11/Makefile.inc +++ b/src/mainboard/roda/rv11/Makefile.inc @@ -16,7 +16,10 @@ bootblock-y += gpio.c romstage-y += gpio.c -romstage-y += variants/$(VARIANT_DIR)/romstage.c +bootblock-y += variants/$(VARIANT_DIR)/early_init.c +romstage-y += variants/$(VARIANT_DIR)/early_init.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += variants/$(VARIANT_DIR)/gma-mainboard.ads CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/roda/rv11/romstage.c b/src/mainboard/roda/rv11/early_init.c index f1681384a8..f1681384a8 100644 --- a/src/mainboard/roda/rv11/romstage.c +++ b/src/mainboard/roda/rv11/early_init.c diff --git a/src/mainboard/roda/rv11/variants/rv11/romstage.c b/src/mainboard/roda/rv11/variants/rv11/early_init.c index 38c4064772..5081c005aa 100644 --- a/src/mainboard/roda/rv11/variants/rv11/romstage.c +++ b/src/mainboard/roda/rv11/variants/rv11/early_init.c @@ -21,10 +21,6 @@ #include <northbridge/intel/sandybridge/sandybridge.h> #include <southbridge/intel/bd82x6x/pch.h> -void mainboard_config_superio(void) -{ -} - void mainboard_fill_pei_data(struct pei_data *const pei_data) { const struct pei_data pei_data_template = { diff --git a/src/mainboard/roda/rv11/variants/rw11/romstage.c b/src/mainboard/roda/rv11/variants/rw11/early_init.c index 7321dac398..f3865fc359 100644 --- a/src/mainboard/roda/rv11/variants/rw11/romstage.c +++ b/src/mainboard/roda/rv11/variants/rw11/early_init.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include <bootblock_common.h> #include <stdint.h> #include <device/pci.h> #include <device/pci_ops.h> @@ -25,7 +26,7 @@ #include <superio/ite/it8783ef/it8783ef.h> #include <superio/ite/common/ite.h> -void mainboard_config_superio(void) +void bootblock_mainboard_early_init(void) { const pnp_devfn_t dev = PNP_DEV(0x2e, IT8783EF_GPIO); |