--- zzzz-none-000/linux-4.4.271/arch/arm/Makefile	2021-06-03 06:22:09.000000000 +0000
+++ hawkeye-5590-750/linux-4.4.271/arch/arm/Makefile	2023-04-19 10:22:27.000000000 +0000
@@ -13,6 +13,8 @@
 # Ensure linker flags are correct
 LDFLAGS		:=
 
+KASAN_SANITIZE := n
+
 LDFLAGS_vmlinux	:=-p --no-undefined -X --pic-veneer
 ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
 LDFLAGS_vmlinux	+= --be8
@@ -22,11 +24,16 @@
 ifeq ($(CONFIG_ARM_MODULE_PLTS),y)
 LDFLAGS_MODULE	+= -T $(srctree)/arch/arm/kernel/module.lds
 endif
+LDFLAGS_vmlinux += --gc-sections
 
 OBJCOPYFLAGS	:=-O binary -R .comment -S
 GZFLAGS		:=-9
 #KBUILD_CFLAGS	+=-pipe
 
+ifndef CONFIG_FUNCTION_TRACER
+KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections
+endif
+
 # Never generate .eh_frame
 KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
 
@@ -149,6 +156,11 @@
 textofs-$(CONFIG_SA1111) := 0x00208000
 endif
 textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
+ifneq ($(CONFIG_ARCH_IPQ6018),y)
+textofs-$(CONFIG_ARCH_IPQ256M) := 0x01208000
+else
+textofs-$(CONFIG_ARCH_IPQ256M) := 0x01008000
+endif
 textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
 
@@ -251,9 +263,11 @@
 else
 MACHINE  :=
 endif
+ifeq ($(CONFIG_ARCH_QCOM),)
 ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y)
 MACHINE  :=
 endif
+endif
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
 platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))
@@ -264,6 +278,10 @@
 else
 KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
 endif
+else
+ifeq ($(CONFIG_ARCH_QCOM),y)
+KBUILD_CPPFLAGS := -I$(srctree)/arch/arm/mach-qcom/include $(KBUILD_CPPFLAGS)
+endif
 endif
 
 export	TEXT_OFFSET GZFLAGS MMUEXT
@@ -288,6 +306,9 @@
 core-y				+= arch/arm/crypto/
 core-y				+= arch/arm/firmware/
 core-y				+= $(machdirs) $(platdirs)
+# AVM(begin)
+core-y				+= arch/arm/avm_enh/
+# AVM(end)
 
 drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/