--- zzzz-none-000/linux-4.9.279/arch/arm/Kconfig	2021-08-08 06:38:54.000000000 +0000
+++ puma7-arm-6591-750/linux-4.9.279/arch/arm/Kconfig	2023-02-08 10:58:12.000000000 +0000
@@ -1,3 +1,5 @@
+# Includes Intel Corporation's changes/modifications dated: 2017, 2018.
+# Changed/modified portions - Copyright (c) 2017-2018, Intel Corporation.
 config ARM
 	bool
 	default y
@@ -47,10 +49,10 @@
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_C_RECORDMCOUNT
 	select HAVE_DEBUG_KMEMLEAK
-	select HAVE_DMA_API_DEBUG
+	#select HAVE_DMA_API_DEBUG
 	select HAVE_DMA_CONTIGUOUS if MMU
 	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU
-	select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU
+	#select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU
 	select HAVE_EXIT_THREAD
 	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
 	select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
@@ -242,6 +244,7 @@
 config ARM_PATCH_PHYS_VIRT
 	bool "Patch physical to virtual translations at runtime" if EMBEDDED
 	default y
+	depends on MACH_PUMA6 || MACH_PUMA7 
 	depends on !XIP_KERNEL && MMU
 	help
 	  Patch phys-to-virt and virt-to-phys translation functions at
@@ -255,6 +258,19 @@
 	  this feature (eg, building a kernel for a single machine) and
 	  you need to shrink the kernel to the minimal size.
 
+config ARM_PATCH_PHYS_VIRT_16BIT
+	bool "Extend physical to virtual translations"
+	default n
+	depends on ARM_PATCH_PHYS_VIRT
+	help
+	  This option extends the physical to virtual translation patching
+	  to allow physical memory down to a theoretical minimum of 64K
+	  boundaries (actual minimum is 1M).
+
+config RUNTIME_PHYS_OFFSET
+	bool
+
+
 config NEED_MACH_IO_H
 	bool
 	help
@@ -320,10 +336,12 @@
 # The "ARM system type" choice list is ordered alphabetically by option
 # text.  Please add new entries in the option alphabetic order.
 #
-choice
-	prompt "ARM system type"
-	default ARM_SINGLE_ARMV7M if !MMU
-	default ARCH_MULTIPLATFORM if MMU
+#choice
+#	prompt "ARM system type"
+#	default ARM_SINGLE_ARMV7M if !MMU
+#	default ARCH_MULTIPLATFORM if MMU
+#
+#endchoice
 
 config ARCH_MULTIPLATFORM
 	bool "Allow multiple platforms to be selected"
@@ -340,6 +358,21 @@
 	select SPARSE_IRQ
 	select USE_OF
 
+config ARCH_AVALANCHE
+	bool "Intel Avalanche (Puma5, Puma6, Puma7...)"
+	select ARM_AVALANCHE_SOC
+	select CPU_V6
+	select CPU_V6K
+	select ICST
+	select ARM_AMBA
+	select HAVE_CLK
+	select NEED_MACH_MEMORY_H
+	help
+	  Support for Intel's Avalanche Platform
+
+
+source "arch/arm/mach-avalanche/Kconfig"
+
 config ARM_SINGLE_ARMV7M
 	bool "ARMv7-M based platforms (Cortex-M0/M3/M4)"
 	depends on !MMU
@@ -644,7 +677,7 @@
 	help
 	  Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
 
-endchoice
+#endchoice
 
 menu "Multiple platform selection"
 	depends on ARCH_MULTIPLATFORM
@@ -1442,8 +1475,11 @@
 		bool "1G/3G user/kernel split"
 endchoice
 
+# PAGE_OFFSET made configurable since some code doesn't use memory.h header
+# but get page_offset some other way. unified-image (P6+) does not suffer from such problem.
 config PAGE_OFFSET
 	hex
+	prompt "Virtual start address of the first bank of RAM" if ARM && !ARM_PATCH_PHYS_VIRT
 	default PHYS_OFFSET if !MMU
 	default 0x40000000 if VMSPLIT_1G
 	default 0x80000000 if VMSPLIT_2G
@@ -1604,6 +1640,8 @@
 
 config AEABI
 	bool "Use the ARM EABI to compile the kernel"
+	depends on !CPU_32v4
+	default y	
 	help
 	  This option allows for the kernel to be compiled using the latest
 	  ARM ABI (aka EABI).  This is only useful if you are using a user
@@ -1736,6 +1774,7 @@
 	int "Maximum zone order"
 	default "12" if SOC_AM33XX
 	default "9" if SA1111 || ARCH_EFM32
+	default "14" if (ARCH_AVALANCHE && MACH_PUMA7)
 	default "11"
 	help
 	  The kernel memory allocator divides physically contiguous memory
@@ -2207,3 +2246,26 @@
 source "lib/Kconfig"
 
 source "arch/arm/kvm/Kconfig"
+
+config AVM_BUGFIX_CPPI_PP_APP2NP_INFRA_HIGH
+	bool "AVM: Bugfix for Intel change PKTPROSSW-191"
+	default y
+	help
+	   Because the number of descriptors for the queues 499-503
+	   are not add added to numDesc of the region 1, space of
+	   region 2 was used. Therefor descriptors in queue 448
+	   where overwritten (Intel Case 00210974). This results
+	   in a crash the first time a DOCSIS management packet
+	   needs to by send.
+
+config AVM_CPPI_DEBUG
+	bool "AVM: CPPI: show regions and descriptors allocated"
+	default y
+	help
+	   Output can be used to detect problems with the 
+	   region and descriptor configuration in
+	   "arch/arm/mach-avalanche/puma7/puma7_cppi.c".
+
+config AVM_FASTIRQ
+	def_bool y
+	depends on AVM_RTE