summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-12-26 20:15:58 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2018-12-30 21:32:24 +0000
commitfb25f9fa05751163fef2a4dabea03f07f91fdbb0 (patch)
treeadc6d0d7bd4ef4f4fbf931ca6604383ad0b82eec /src
parentd7892bc3913fab68c880d3b7a1206b4c23d5dbe3 (diff)
drivers/uart/oxpcie: Fix early console
Fix build for POSTCAR_STAGE=y. Also add driver for bootblock and verstage. Change-Id: If57033353c07854e21b630c58ad69931eb572da9 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30495 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src')
-rw-r--r--src/drivers/uart/Makefile.inc6
-rw-r--r--src/drivers/uart/oxpcie_early.c4
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)
{