7 files changed, 10 insertions, 59 deletions

diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index 8971d71286..78d40818ea 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
 	select HAVE_SMI_HANDLER
-	select INTEL_PCH_UART_CONSOLE
 	select LID_SWITCH
 	select MAINBOARD_HAS_CHROMEOS
 	select MARK_GRAPHICS_MEM_WRCOMB
@@ -33,10 +32,6 @@ config BOOT_MEDIA_SPI_BUS
 	int
 	default 0
 
-config INTEL_PCH_UART_CONSOLE_NUMBER
-	hex
-	default 2
-
 config MAINBOARD_DIR
 	string
 	default "intel/kunimitsu"
diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig
index 22ce4735ec..601efb0782 100644
--- a/src/mainboard/intel/sklrvp/Kconfig
+++ b/src/mainboard/intel/sklrvp/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select MMCONF_SUPPORT
 	select MONOTONIC_TIMER_MSR
 	select PCIEXP_L1_SUB_STATE
-	select INTEL_PCH_UART_CONSOLE
 	select SOC_INTEL_SKYLAKE
 	select VBOOT_DYNAMIC_WORK_BUFFER
 	select VIRTUAL_DEV_SWITCH
@@ -30,10 +29,6 @@ config BOOT_MEDIA_SPI_BUS
 	int
 	default 0
 
-config INTEL_PCH_UART_CONSOLE_NUMBER
-	hex
-	default 2
-
 config MAINBOARD_DIR
 	string
 	default "intel/sklrvp"
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 207816d30d..856b84fa1f 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -17,6 +17,7 @@ config CPU_SPECIFIC_OPTIONS
 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select CACHE_ROM
 	select CAR_MIGRATION
+	select CONSOLE_SERIAL8250MEM
 	select COLLECT_TIMESTAMPS
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select CPU_MICROCODE_IN_CBFS
@@ -24,6 +25,7 @@ config CPU_SPECIFIC_OPTIONS
 	select HAVE_HARD_RESET
 	select HAVE_MONOTONIC_TIMER
 	select HAVE_SMI_HANDLER
+	select HAVE_UART_MEMORY_MAPPED
 	select IOAPIC
 	select MMCONF_SUPPORT
 	select MMCONF_SUPPORT_DEFAULT
@@ -160,18 +162,6 @@ config IFD_PLATFORM_SECTION
 	string
 	default ""
 
-config INTEL_PCH_UART_CONSOLE
-	bool "Use Serial IO UART for console"
-	default n
-	select HAVE_UART_MEMORY_MAPPED
-	select CONSOLE_SERIAL8250MEM
-	depends on !CONFIG_DRIVERS_OXFORD_OXPCIE
-
-config INTEL_PCH_UART_CONSOLE_NUMBER
-	hex "Serial IO UART number to use for console"
-	default "0x0"
-	depends on INTEL_PCH_UART_CONSOLE
-
 config ME_BIN_PATH
 	string "Path to management engine firmware"
 	depends on HAVE_ME_BIN
@@ -222,7 +212,6 @@ config SMM_TSEG_SIZE
 config TTYS0_BASE
 	hex
 	default 0xfe034000
-	depends on INTEL_PCH_UART_CONSOLE
 
 config VGA_BIOS_ID
 	string
diff --git a/src/soc/intel/skylake/romstage/Makefile.inc b/src/soc/intel/skylake/romstage/Makefile.inc
index 52029fcf78..68467b5ab0 100644
--- a/src/soc/intel/skylake/romstage/Makefile.inc
+++ b/src/soc/intel/skylake/romstage/Makefile.inc
@@ -6,4 +6,4 @@ romstage-y += romstage.c
 romstage-y += smbus.c
 romstage-y += spi.c
 romstage-y += systemagent.c
-romstage-$(CONFIG_INTEL_PCH_UART_CONSOLE) += uart.c
+romstage-y += uart.c
diff --git a/src/soc/intel/skylake/romstage/romstage.c b/src/soc/intel/skylake/romstage/romstage.c
index 4230664911..919b747211 100644
--- a/src/soc/intel/skylake/romstage/romstage.c
+++ b/src/soc/intel/skylake/romstage/romstage.c
@@ -50,8 +50,7 @@ void soc_pre_console_init(struct romstage_params *params)
 	/* System Agent Early Initialization */
 	systemagent_early_init();
 
-	if (IS_ENABLED(CONFIG_INTEL_PCH_UART_CONSOLE))
-		pch_uart_init();
+	pch_uart_init();
 }
 
 /* SOC initialization before RAM is enabled */
diff --git a/src/soc/intel/skylake/romstage/uart.c b/src/soc/intel/skylake/romstage/uart.c
index 8ddcbadda8..8aa1053150 100644
--- a/src/soc/intel/skylake/romstage/uart.c
+++ b/src/soc/intel/skylake/romstage/uart.c
@@ -28,27 +28,10 @@
 
 void pch_uart_init(void)
 {
-	device_t dev;
-	u32 tmp, legacy;
+	device_t dev = PCH_DEV_UART2;
+	u32 tmp;
 	u8 *base = (u8 *)CONFIG_TTYS0_BASE;
 
-	switch (CONFIG_INTEL_PCH_UART_CONSOLE_NUMBER) {
-	case 0:
-		dev = PCH_DEV_UART0;
-		legacy = SIO_PCH_LEGACY_UART0;
-		break;
-	case 1:
-		dev = PCH_DEV_UART1;
-		legacy = SIO_PCH_LEGACY_UART1;
-		break;
-	case 2:
-		dev = PCH_DEV_UART2;
-		legacy = SIO_PCH_LEGACY_UART2;
-		break;
-	default:
-		return;
-	}
-
 	/* Set configured UART base address */
 	pci_write_config32(dev, PCI_BASE_ADDRESS_0, (u32)base);
 
@@ -70,6 +53,7 @@ void pch_uart_init(void)
 		(SIO_REG_PPR_CLOCK_M_DIV << 1);
 	write32(base + SIO_REG_PPR_CLOCK, tmp);
 
-	/* Put UART in byte access mode for 16550 compatibility */
-	pcr_andthenor32(PID_SERIALIO, R_PCH_PCR_SERIAL_IO_GPPRVRW7, 0, legacy);
+	/* Put UART2 in byte access mode for 16550 compatibility */
+	pcr_andthenor32(PID_SERIALIO, R_PCH_PCR_SERIAL_IO_GPPRVRW7, 0,
+		SIO_PCH_LEGACY_UART2);
 }
diff --git a/src/soc/intel/skylake/uart.c b/src/soc/intel/skylake/uart.c
index 36b1b5a71b..03d2ba6a7c 100644
--- a/src/soc/intel/skylake/uart.c
+++ b/src/soc/intel/skylake/uart.c
@@ -28,18 +28,7 @@
 
 static int pch_uart_is_debug(struct device *dev)
 {
-	if (!IS_ENABLED(CONFIG_INTEL_PCH_UART_CONSOLE))
-		return 0;
-
-	switch (dev->path.pci.devfn) {
-	case PCH_DEVFN_UART0:
-		return CONFIG_INTEL_PCH_UART_CONSOLE_NUMBER == 0;
-	case PCH_DEVFN_UART1:
-		return CONFIG_INTEL_PCH_UART_CONSOLE_NUMBER == 1;
-	case PCH_DEVFN_UART2:
-		return CONFIG_INTEL_PCH_UART_CONSOLE_NUMBER == 2;
-	}
-	return 0;
+	return dev->path.pci.devfn == PCH_DEVFN_UART2;
 }
 
 static void pch_uart_read_resources(struct device *dev)