--- zzzz-none-000/linux-4.9.279/Makefile	2021-08-08 06:38:54.000000000 +0000
+++ puma7-arm-6591-750/linux-4.9.279/Makefile	2023-02-08 10:58:12.000000000 +0000
@@ -1,3 +1,5 @@
+# Includes Intel Corporation's changes/modifications dated: 2017-2019.
+# Changed/modified portions - Copyright (c) 2017-2019, Intel Corporation.
 VERSION = 4
 PATCHLEVEL = 9
 SUBLEVEL = 279
@@ -370,6 +372,7 @@
 		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
 		-I$(srctree)/include/uapi \
 		-I$(objtree)/include/generated/uapi \
+		$(USERINCLUDE_AVM_SUBPROJECTS) \
                 -include $(srctree)/include/linux/kconfig.h
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
@@ -379,15 +382,33 @@
 		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
 		-I$(objtree)/arch/$(hdr-arch)/include/generated \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
-		-I$(objtree)/include
+		-I$(objtree)/include \
+		-I$(srctree)/include/linux/avalanche/generic \
+		$(LINUXINCLUDE_AVM_SUBPROJECTS)
 
 LINUXINCLUDE	+= $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
 
+LINUXINCLUDE	+= -include include/generated/autoconf.h \
+		-include $(srctree)/include/linux/puma_autoconf.h \
+		-I$(srctree)/include/asm-arm/arch-avalanche/generic
+
+ifeq ($(DOCSIS_SOC),PUMA5)
+LINUXINCLUDE += -I$(srctree)/include/asm-arm/arch-avalanche/puma5
+endif
+ifeq ($(DOCSIS_SOC),PUMA6)
+LINUXINCLUDE += -I$(srctree)/include/asm-arm/arch-avalanche/puma6
+endif
+ifeq ($(DOCSIS_SOC),PUMA7)
+LINUXINCLUDE += -I$(srctree)/include/asm-arm/arch-avalanche/puma7
+endif
+
 KBUILD_AFLAGS   := -D__ASSEMBLY__
 KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 		   -fno-strict-aliasing -fno-common -fshort-wchar \
 		   -Werror-implicit-function-declaration \
 		   -Wno-format-security \
+		   -Wno-unused-parameter \
+		   -fno-delete-null-pointer-checks
 		   -std=gnu89
 KBUILD_CPPFLAGS := -D__KERNEL__
 KBUILD_AFLAGS_KERNEL :=
@@ -447,7 +468,7 @@
 # output directory.
 outputmakefile:
 ifneq ($(KBUILD_SRC),)
-	$(Q)ln -fsn $(srctree) source
+	$(Q)ln --relative -fsn $(srctree) source
 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
 	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
 endif
@@ -1169,6 +1190,13 @@
 
 # ---------------------------------------------------------------------------
 # Kernel headers
+# This section is used for exporting Kernel Headers for use by user space.
+# Kbuild defines destination-y: destination directory of all headers in the dir & header-y: headers to install.
+# destination-y must be defined (and not blank) in the Kbuild files (otherwise hdr-dst will override)!
+# subdirectories to visit are also defined inside the Kbuild files.
+#include include/asm-arm/arch-avalanche/generic/Kbuild
+#kernel-headers-dir := $(TARGET_HOME)/ti/include/asm-arm/arch-avalanche/generic/
+#update := cp -uf  $(addprefix $(destination-y), $(header-y))
 
 #Default location for installed headers
 export INSTALL_HDR_PATH = $(objtree)/usr
@@ -1196,6 +1224,14 @@
 	  $(error Headers not exportable for the $(SRCARCH) architecture))
 	$(Q)$(MAKE) $(hdr-inst)=include/uapi
 	$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst)
+ifeq ($(DOCSIS_SOC),PUMA6)
+	$(Q)$(MAKE) $(hdr-inst)=include/asm-$(hdr-arch)/arch-avalanche/puma6 $(hdr-dst)
+endif
+ifeq ($(DOCSIS_SOC),PUMA7)
+	$(Q)$(MAKE) $(hdr-inst)=include/asm-$(hdr-arch)/arch-avalanche/puma7 $(hdr-dst)
+endif
+	$(Q)$(MAKE) $(hdr-inst)=include/asm-$(hdr-arch)/arch-avalanche/generic $(hdr-dst)
+	$(Q)$(update) $(kernel-headers-dir)
 
 PHONY += headers_check_all
 headers_check_all: headers_install_all
@@ -1748,6 +1784,8 @@
   include $(cmd_files)
 endif
 
+
+-include $(srctree)/avm/make/generated/linux.make
 endif	# skip-makefile
 
 PHONY += FORCE