From 80358a1f478713861a3e66874a1ffb7cf259bd7c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Fri, 21 Jul 2017 17:10:15 +0000 Subject: Revert "soc/intel/cannonlake: Add postcar stage support" This reverts commit 399c022a8c6cba7ad6d75fdf377a690395877611. This was merged too early. I'll repost it. Change-Id: Iabac0aaa0a16404c885875137cf34bf64bf956f7 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/20686 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/soc/intel/cannonlake/Makefile.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/soc/intel/cannonlake/Makefile.inc') diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc index e427f98929..480e0477ad 100644 --- a/src/soc/intel/cannonlake/Makefile.inc +++ b/src/soc/intel/cannonlake/Makefile.inc @@ -5,23 +5,20 @@ subdirs-y += ../../../cpu/intel/microcode subdirs-y += ../../../cpu/x86/mtrr subdirs-y += ../../../cpu/x86/tsc +bootblock-$(CONFIG_DRIVERS_UART_8250MEM) += uart.c bootblock-y += bootblock/bootblock.c bootblock-y += bootblock/cpu.c bootblock-y += bootblock/pch.c bootblock-y += bootblock/report_platform.c bootblock-y += gpio.c -bootblock-$(CONFIG_UART_DEBUG) += uart.c romstage-y += cbmem.c romstage-y += reset.c -romstage-$(CONFIG_UART_DEBUG) += uart.c +romstage-$(CONFIG_DRIVERS_UART_8250MEM) += uart.c ramstage-y += cbmem.c ramstage-$(CONFIG_PLATFORM_USES_FSP2_0) += reset.c -ramstage-$(CONFIG_UART_DEBUG) += uart.c - -postcar-y += memmap.c -postcar-$(CONFIG_UART_DEBUG) += uart.c +ramstage-$(CONFIG_DRIVERS_UART_8250MEM) += uart.c CPPFLAGS_common += -I$(src)/soc/intel/cannonlake/include/fsp20 CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp2_0/cannonlake -- cgit v1.2.3