From fb25f9fa05751163fef2a4dabea03f07f91fdbb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 26 Dec 2018 20:15:58 +0200 Subject: [PATCH] drivers/uart/oxpcie: Fix early console MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix build for POSTCAR_STAGE=y. Also add driver for bootblock and verstage. Change-Id: If57033353c07854e21b630c58ad69931eb572da9 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/30495 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/drivers/uart/Makefile.inc | 6 ++++-- src/drivers/uart/oxpcie_early.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc index c7aa1ae784..912a6847d9 100644 --- a/src/drivers/uart/Makefile.inc +++ b/src/drivers/uart/Makefile.inc @@ -29,9 +29,11 @@ smm-$(CONFIG_DEBUG_SMI) += uart8250mem.c endif ifeq ($(CONFIG_DRIVERS_UART_OXPCIE),y) -ramstage-y += oxpcie_early.c oxpcie.c -postcar-y += oxpcie_early.c +bootblock-y += oxpcie_early.c +verstage-y += oxpcie_early.c romstage-y += oxpcie_early.c +postcar-y += oxpcie_early.c +ramstage-y += oxpcie_early.c oxpcie.c endif ifeq ($(CONFIG_DRIVERS_UART_PL011),y) diff --git a/src/drivers/uart/oxpcie_early.c b/src/drivers/uart/oxpcie_early.c index 42f7966e03..2a01cb60b7 100644 --- a/src/drivers/uart/oxpcie_early.c +++ b/src/drivers/uart/oxpcie_early.c @@ -79,12 +79,12 @@ uintptr_t uart_platform_base(int idx) return 0; } -#ifndef __PRE_RAM__ void oxford_remap(u32 new_base) { +#if ENV_RAMSTAGE uart0_base = new_base + 0x1000; -} #endif +} unsigned int uart_platform_refclk(void) {