From 89b6111d7dc2acffbf6837d626c3c451274723e3 Mon Sep 17 00:00:00 2001
From: Shiyong Li <a22381@motorola.com>
Date: Fri, 8 Dec 2017 11:32:14 -0800
Subject: [PATCH] fs/exfat: build exfat lib as DLKM

Build exfat lib as exfat.ko.

Change-Id: I653e944607f0d05e6f5ff8af4743291567d824c3
Signed-off-by: Shiyong Li <a22381@motorola.com>
Reviewed-on: https://gerrit.mot.com/1102175
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Igor Kovalenko <igork@motorola.com>
Submit-Approved: Jira Key
---
 fs/exfat/Android.mk |  8 +++++++
 fs/exfat/Kbuild     |  6 +++++
 fs/exfat/Makefile   | 56 +++++----------------------------------------
 3 files changed, 20 insertions(+), 50 deletions(-)
 create mode 100644 fs/exfat/Android.mk
 create mode 100644 fs/exfat/Kbuild

diff --git a/fs/exfat/Android.mk b/fs/exfat/Android.mk
new file mode 100644
index 000000000000..44bc00c1e53c
--- /dev/null
+++ b/fs/exfat/Android.mk
@@ -0,0 +1,8 @@
+DLKM_DIR := motorola/kernel/modules
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := exfat.ko
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/fs/exfat/Kbuild b/fs/exfat/Kbuild
new file mode 100644
index 000000000000..1983f023b507
--- /dev/null
+++ b/fs/exfat/Kbuild
@@ -0,0 +1,6 @@
+# add -Wall to try to catch everything we can.
+EXTRA_CFLAGS += -Wall
+
+exfat-y := exfat_core.o exfat_super.o exfat_api.o exfat_blkdev.o exfat_cache.o \
+         exfat_data.o exfat_bitmap.o exfat_nls.o exfat_oal.o exfat_upcase.o
+obj-m += exfat.o
diff --git a/fs/exfat/Makefile b/fs/exfat/Makefile
index 711ed87f991b..4191dea22679 100644
--- a/fs/exfat/Makefile
+++ b/fs/exfat/Makefile
@@ -1,54 +1,10 @@
-#
-# Makefile for Linux FAT12/FAT16/FAT32(VFAT)/FAT64(ExFAT) filesystem driver.
-#
-
-ifneq ($(KERNELRELEASE),)
-# call from kernel build system
-
-obj-$(CONFIG_EXFAT_FS) += exfat.o
-
-exfat-objs := exfat_core.o exfat_super.o exfat_api.o exfat_blkdev.o exfat_cache.o \
-			   exfat_data.o exfat_bitmap.o exfat_nls.o exfat_oal.o exfat_upcase.o
-
-else
-# external module build
-
-EXTRA_FLAGS += -I$(PWD)
-
-#
-# KDIR is a path to a directory containing kernel source.
-# It can be specified on the command line passed to make to enable the module to
-# be built and installed for a kernel other than the one currently running.
-# By default it is the path to the symbolic link created when
-# the current kernel's modules were installed, but
-# any valid path to the directory in which the target kernel's source is located
-# can be provided on the command line.
-#
-KDIR	?= /lib/modules/$(shell uname -r)/build
-MDIR	?= /lib/modules/$(shell uname -r)
-PWD	:= $(shell pwd)
-PWD	:= $(shell pwd)
-
-export CONFIG_EXFAT_FS := m
+KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
 
 all:
-	$(MAKE) -C $(KDIR) M=$(PWD) modules
+	$(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS)
+
+modules_install:
+	$(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install
 
 clean:
-	$(MAKE) -C $(KDIR) M=$(PWD) clean
-
-help:
-	$(MAKE) -C $(KDIR) M=$(PWD) help
-
-install: exfat.ko
-	rm -f ${MDIR}/kernel/fs/exfat/exfat.ko
-	install -m644 -b -D exfat.ko ${MDIR}/kernel/fs/exfat/exfat.ko
-	depmod -aq
-
-uninstall:
-	rm -rf ${MDIR}/kernel/fs/exfat
-	depmod -aq
-
-endif
-
-.PHONY : all clean install uninstall
+	$(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean