[Bionic][PATCH 1/4] UBUNTU: SAUCE: Revert "xr-usb-serial: fix kbuild"

[Wen-chien Jesse Sung]

This reverts commit e8bf446f67cba
UBUNTU: SAUCE: xr-usb-serial: fix kbuild

Commit e8bf446f67cba is tightly coupled with the implementation of Dell
Edge Gateway BIOS and causes issues on other platforms.

BugLink: https://launchpad.net/bugs/1885271
Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
---
 ubuntu/xr-usb-serial/Kconfig                | 11 -----------
 ubuntu/xr-usb-serial/Makefile               | 15 ++++++++++++++-
 ubuntu/xr-usb-serial/xr_usb_serial_common.h |  3 ---
 3 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 ubuntu/xr-usb-serial/Kconfig

diff --git a/ubuntu/xr-usb-serial/Kconfig b/ubuntu/xr-usb-serial/Kconfig
deleted file mode 100644
index d563a28fde6bb..0000000000000
--- a/ubuntu/xr-usb-serial/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-config USB_SERIAL_EXAR
-	bool "Exar USB UART (serial port) driver"
-	depends on X86 || X86_64
-	depends on TTY
-	depends on GPIOLIB
-	default y
-	---help---
-	  Say Y here if you want to use a Exar USB to Serial device.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called xr_usb_serial
diff --git a/ubuntu/xr-usb-serial/Makefile b/ubuntu/xr-usb-serial/Makefile
index 75eebc0725f77..533988cede120 100644
--- a/ubuntu/xr-usb-serial/Makefile
+++ b/ubuntu/xr-usb-serial/Makefile
@@ -1,3 +1,16 @@
 obj-m := xr_usb_serial_common.o
 
-obj-$(CONFIG_USB_SERIAL_EXAR)			+= xr_usb_serial_common.o
+#KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+KERNELDIR ?=$(shell pwd)/../parts/kernel/build
+PWD       := $(shell pwd)
+
+EXTRA_CFLAGS	:= -DDEBUG=0
+
+all:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD)
+
+modules_install:
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+
+clean:
+	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions vtty
diff --git a/ubuntu/xr-usb-serial/xr_usb_serial_common.h b/ubuntu/xr-usb-serial/xr_usb_serial_common.h
index 7e5ccf1da4e28..d462bb5751a4e 100644
--- a/ubuntu/xr-usb-serial/xr_usb_serial_common.h
+++ b/ubuntu/xr-usb-serial/xr_usb_serial_common.h
@@ -15,9 +15,6 @@
  */
 
 #include <linux/gpio/driver.h>
-#include <linux/usb/cdc.h>
-#include <linux/usb.h>
-#include <linux/tty.h>
 /*
  * CMSPAR, some architectures can't have space and mark parity.
  */
-- 
2.25.1