UBUNTU: SAUCE: hio: Makefile and Kconfig

BugLink: http://bugs.launchpad.net/bugs/1635594
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
BugLink: http://bugs.launchpad.net/bugs/1635594
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig
index f15ccd8b7f4c1b03a39eb3839f30e66212a41e95..8cea998f29a325470667d856ef8e95febe463d25 100644 (file)
--- a/ubuntu/Kconfig
+++ b/ubuntu/Kconfig
@@ -7,6 +7,10 @@ menu "Ubuntu Supplied Third-Party Device Drivers"
 # your new entry and maintain the six lines below.
 #
 
+##
+##
+##
+source "ubuntu/hio/Kconfig"
 ##
 ##
 ##

diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index 7690038446a736029741aed857d8dbb46f4ec5ea..3e2327d4f7cb6db8bf22afe895f7d8ef3c7dac23 100644 (file)
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -21,6 +21,13 @@ endif
 ##
 ##
 ##
+obj-$(CONFIG_HIO)             += hio/
+##
+##
+##
+##
+##
+##
 
 # This is a stupid trick to get kbuild to create ubuntu/built-in.o
 obj- += foo.o

diff --git a/ubuntu/hio/Kconfig b/ubuntu/hio/Kconfig
new file mode 100644 (file)
index 0000000..1847ce2
--- /dev/null
+++ b/ubuntu/hio/Kconfig
@@ -0,0 +1,4 @@
+config HIO
+       tristate "ES3000 V2 High-Performance PCIe SSD"
+       ---help---
+       Driver for ES3000 V2 High-Performance PCIe SSD.

diff --git a/ubuntu/hio/Makefile b/ubuntu/hio/Makefile
index b03e6273a127d7942ed1aa391752c03a34ab36cc..b768640c702ef2259dfbc1f3a5b8932753650129 100644 (file)
--- a/ubuntu/hio/Makefile
+++ b/ubuntu/hio/Makefile
@@ -1,69 +1 @@
-ifneq ($(KERNELRELEASE),)
-#      hio-y := hio_main.o
-#      obj-$(CONFIG_HIO_DRIVER) += hio.o
-       obj-m += hio.o
-else
-
-KVER=
-ifeq ($(KVER),)
-  KVER=$(shell uname -r)
-endif
-
-PDIR=
-ifeq ($(PDIR),)
-  PDIR=extra
-endif
-
-PREFIX=
-
-MODDIR=/lib/modules/$(KVER)/$(PDIR)/hio/
-MOD=hio.ko
-
-ifeq ($(KVER),2.6.32-300.3.1.el6uek.x86_64)
-  FLAGS += -DSSD_QUEUE_PBIO
-endif
-ifeq ($(KVER),2.6.32-220.el6.x86_64)
-  FLAGS += -DSSD_QUEUE_PBIO
-endif
-ifeq ($(KVER),2.6.32-358.el6.x86_64)
-  FLAGS += -DSSD_QUEUE_PBIO
-endif
-ifeq ($(KVER),2.6.32-358.23.2.el6.x86_64)
-  FLAGS += -DSSD_QUEUE_PBIO
-endif
-ifeq ($(KVER),3.0.58-0.6.6-xen)
-  FLAGS += -DSSD_QUEUE_PBIO
-endif
-ifeq ($(KVER),3.2.0-4-amd64)
-  FLAGS += -DSSD_BIOVEC_PHYS_MERGEABLE_FIXED
-endif
-ifeq ($(KVER),2.6.39-400.209.1.el5uek) #Oracle Linux Server release 5.10
-  FLAGS += -DSSD_BIOVEC_PHYS_MERGEABLE_FIXED
-endif
-ifeq ($(KVER),2.6.39-400.215.10.el5uek) #Oracle Linux Server release 5.11
-  FLAGS += -DSSD_BIOVEC_PHYS_MERGEABLE_FIXED
-endif
-ifeq ($(KVER),2.6.39-200.24.1.el6uek.x86_64) #Oracle Linux Server release 6.3
-  FLAGS += -DSSD_BIOVEC_PHYS_MERGEABLE_FIXED
-endif
-ifeq ($(KVER),2.6.39-400.17.1.el6uek.x86_64) #Oracle Linux Server release 6.4
-  FLAGS += -DSSD_BIOVEC_PHYS_MERGEABLE_FIXED
-endif
-
-
-KERNELDIR ?= /lib/modules/$(KVER)/build
-PWD       := $(shell pwd)
-
-default:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) EXTRA_CFLAGS="$(FLAGS)" modules
-clean:
-       rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions Module.*
-
-install: default
-       mkdir -p $(PREFIX)/$(MODDIR)
-       install -m 444 $(MOD) $(PREFIX)/$(MODDIR)
-       @if [ "$(PREFIX)" = "" ]; then /sbin/depmod -a ;\
-       else echo " *** Run 'depmod -a' to update the module database.";\
-       fi
-endif
-
+obj-$(CONFIG_HIO) += hio.o