Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / Makefile

diff --git a/Makefile b/Makefile
index a10c99a7fa646fbaa3145c02a3203ed4ad74e678..89c5b4cc790f1317d903a0db4a016d618f9f7f54 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 10
-SUBLEVEL = 54
+SUBLEVEL = 55
 EXTRAVERSION =
 NAME = TOSSUG Baby Fish
 
@@ -192,15 +192,8 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
 # "make" in the configured kernel build directory always uses that.
 # Default value for CROSS_COMPILE is not to prefix executables
 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
-#ARCH          ?= $(SUBARCH)
-#CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
-ifeq ($(TARGET_ARCH), arm)
-ARCH           ?= arm
-CROSS_COMPILE  ?= arm-eabi-
-else
-ARCH           ?= arm64
-CROSS_COMPILE  ?= aarch64-linux-android-
-endif
+ARCH           ?= $(SUBARCH)
+CROSS_COMPILE  ?= $(CONFIG_CROSS_COMPILE:"%"=%)
 
 # Architecture as present in compile.h
 UTS_MACHINE    := $(ARCH)
@@ -381,7 +374,7 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                   -Werror-implicit-function-declaration \
                   -Wno-format-security \
                   -fno-delete-null-pointer-checks \
-                  -Werror=format -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
+                  -w
 
 KBUILD_AFLAGS_KERNEL :=
 KBUILD_CFLAGS_KERNEL :=
@@ -390,13 +383,6 @@ KBUILD_AFLAGS_MODULE  := -DMODULE
 KBUILD_CFLAGS_MODULE  := -DMODULE
 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
 
--include $(srctree)/$(MTK_PROJECT)_mtk_cust.mak
-#MTK_INC += -I$(MTK_ROOT_CUSTOM)/$(MTK_PROJECT)/common
-LINUXINCLUDE    += $(MTK_INC)
-KBUILD_CFLAGS   += $(MTK_CFLAGS) $(MTK_CDEFS) -fno-pic
-KBUILD_CPPFLAGS += $(MTK_CPPFLAGS) $(MTK_CPPDEFS)
-KBUILD_AFLAGS   += $(MTK_AFLAGS) $(MTK_ADEFS)
-
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
 KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
@@ -605,7 +591,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \
 endif
 
 ifneq ($(CONFIG_FRAME_WARN),0)
-KBUILD_CFLAGS += $(call cc-option,-Werror=frame-larger-than=1)
 KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
 endif
 
@@ -868,9 +853,7 @@ define filechk_utsrelease.h
          echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2;    \
          exit 1;                                                         \
        fi;                                                               \
-       (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\";                  \
-       echo \#define BUILD_INFO \"$(MTK_BUILD_VERNO)\";                  \
-       echo \#define BUILD_FINGERPRINT \"$(TARGET_PRODUCT)\";)
+       (echo \#define UTS_RELEASE \"$(KERNELRELEASE)\";)
 endef
 
 define filechk_version.h
@@ -1006,29 +989,6 @@ _modinst_post: _modinst_
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst
        $(call cmd,depmod)
 
-# MTK {
-# Target to install android modules
-
-AMODLIB = $(INSTALL_MOD_PATH)/lib/modules
-export AMODLIB
-AMODSYMLIB = $(INSTALL_MOD_PATH)/../symbols/system/lib/modules
-export AMODSYMLIB
-
-PHONY += android_modules_install
-android_modules_install: _android_modinst_
-
-PHONY += _android_modinst_
-_android_modinst_:
-       @if [ ! -d $(AMODLIB) ]; then \
-               mkdir -p $(AMODLIB); \
-       fi
-       @if [ ! -d $(AMODSYMLIB) ]; then \
-               mkdir -p $(AMODSYMLIB); \
-       fi
-       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.android.modinst
-# MTK }
-
-
 ifeq ($(CONFIG_MODULE_SIG), y)
 PHONY += modules_sign
 modules_sign: