OxPCIe uart: Move under drivers/uart

This driver is only a thin shell for uart8250mem and we could extend it
with further compatible PCI IDs from other vendors/brands.

Change-Id: Ic115b1baa0be0dbaa81e4a17a2e466019d3f4a67
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5329
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

10 files changed, 16 insertions, 18 deletions

diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig
index 5267ff8f5d..1a5f8ff069 100644
--- a/src/drivers/Kconfig
+++ b/src/drivers/Kconfig
@@ -27,7 +27,6 @@ source src/drivers/ics/Kconfig
 source src/drivers/intel/Kconfig
 source src/drivers/ipmi/Kconfig
 source src/drivers/maxim/Kconfig
-source src/drivers/oxford/Kconfig
 source src/drivers/parade/Kconfig
 if PC80_SYSTEM
 source src/drivers/pc80/Kconfig
diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc
index 148e257b5d..f11e4b84ed 100644
--- a/src/drivers/Makefile.inc
+++ b/src/drivers/Makefile.inc
@@ -25,7 +25,6 @@ subdirs-y += i2c
 subdirs-y += intel
 subdirs-y += maxim
 subdirs-y += net
-subdirs-y += oxford
 subdirs-y += parade
 subdirs-y += realtek
 subdirs-y += sil
diff --git a/src/drivers/oxford/Kconfig b/src/drivers/oxford/Kconfig
deleted file mode 100644
index cd7c27ced0..0000000000
--- a/src/drivers/oxford/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-source src/drivers/oxford/oxpcie/Kconfig
diff --git a/src/drivers/oxford/Makefile.inc b/src/drivers/oxford/Makefile.inc
deleted file mode 100644
index 732face171..0000000000
--- a/src/drivers/oxford/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_DRIVERS_OXFORD_OXPCIE) += oxpcie
diff --git a/src/drivers/oxford/oxpcie/Kconfig b/src/drivers/oxford/oxpcie/Kconfig
deleted file mode 100644
index c2ea7b6ad8..0000000000
--- a/src/drivers/oxford/oxpcie/Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-config DRIVERS_OXFORD_OXPCIE
-	bool "Oxford OXPCIe952"
-	default n
-	depends on PCI
-	select DRIVERS_UART_8250MEM
-	select EARLY_PCI_BRIDGE
-	help
-	  Support for Oxford OXPCIe952 serial port PCIe cards.
-	  Currently only devices with the vendor ID 0x1415 and device ID
-	  0xc158 or 0xc11b will work.
diff --git a/src/drivers/oxford/oxpcie/Makefile.inc b/src/drivers/oxford/oxpcie/Makefile.inc
deleted file mode 100644
index 5e3e6e5728..0000000000
--- a/src/drivers/oxford/oxpcie/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-ifeq ($(CONFIG_CONSOLE_SERIAL),y)
-ramstage-y += oxpcie_early.c oxpcie.c
-romstage-y += oxpcie_early.c
-endif
diff --git a/src/drivers/uart/Kconfig b/src/drivers/uart/Kconfig
index 889c69a0bc..a979437023 100644
--- a/src/drivers/uart/Kconfig
+++ b/src/drivers/uart/Kconfig
@@ -21,6 +21,17 @@ config HAVE_UART_SPECIAL
 	bool
 	default n
 
+config DRIVERS_UART_OXPCIE
+	bool "Oxford OXPCIe952"
+	default n
+	depends on PCI
+	select DRIVERS_UART_8250MEM
+	select EARLY_PCI_BRIDGE
+	help
+	  Support for Oxford OXPCIe952 serial port PCIe cards.
+	  Currently only devices with the vendor ID 0x1415 and device ID
+	  0xc158 or 0xc11b will work.
+
 config DRIVERS_UART_PL011
 	bool
 	default n
diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc
index 286bff2112..5164282219 100644
--- a/src/drivers/uart/Makefile.inc
+++ b/src/drivers/uart/Makefile.inc
@@ -18,6 +18,11 @@ ramstage-y += uart8250mem.c
 smm-$(CONFIG_DEBUG_SMI) += uart8250mem.c
 endif
 
+ifeq ($(CONFIG_DRIVERS_UART_OXPCIE),y)
+ramstage-y += oxpcie_early.c oxpcie.c
+romstage-y += oxpcie_early.c
+endif
+
 ifeq ($(CONFIG_DRIVERS_UART_PL011),y)
 bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += pl011.c
 romstage-$(CONFIG_EARLY_CONSOLE) += pl011.c
diff --git a/src/drivers/oxford/oxpcie/oxpcie.c b/src/drivers/uart/oxpcie.c
index 76119d2702..76119d2702 100644
--- a/src/drivers/oxford/oxpcie/oxpcie.c
+++ b/src/drivers/uart/oxpcie.c
diff --git a/src/drivers/oxford/oxpcie/oxpcie_early.c b/src/drivers/uart/oxpcie_early.c
index b81fa8914d..b81fa8914d 100644
--- a/src/drivers/oxford/oxpcie/oxpcie_early.c
+++ b/src/drivers/uart/oxpcie_early.c