From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 11 May 2016 22:12:09 +0000 (+0100)
Subject: kernel: Remove ARM LPAE image
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4bd821afe1823464e03576328daee5d81de855;p=ipfire-3.x.git

kernel: Remove ARM LPAE image

This image was never well tested and there is only little
hardware out there.

Acknowledged-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/kernel/config-armv7hl-lpae b/kernel/config-armv7hl-lpae
deleted file mode 100644
index 0329ba10d..000000000
--- a/kernel/config-armv7hl-lpae
+++ /dev/null
@@ -1,107 +0,0 @@
-CONFIG_PGTABLE_LEVELS=3
-
-#
-# IO Schedulers
-#
-CONFIG_PREEMPT_NOTIFIERS=y
-
-#
-# CPU Core family selection
-#
-CONFIG_ARCH_AXXIA=y
-
-#
-# Power management
-#
-# CONFIG_ARCH_R8A7779 is not set
-
-#
-# Processor Features
-#
-CONFIG_ARM_LPAE=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-
-#
-# Bus support
-#
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_PCIE_IPROC=y
-CONFIG_PCIE_IPROC_PLATFORM=y
-
-#
-# Kernel Features
-#
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_MMU_NOTIFIER=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
-
-#
-# Bus devices
-#
-# CONFIG_SIMPLE_PM_BUS is not set
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_AXXIA=m
-
-#
-# USB GPIO expanders
-#
-CONFIG_POWER_RESET_AXXIA=y
-CONFIG_ROCKCHIP_IODOMAIN=m
-
-#
-# Media drivers
-#
-# CONFIG_IR_SUNXI is not set
-
-#
-# Clock Source drivers
-#
-# CONFIG_SH_TIMER_TMU is not set
-
-#
-# Generic IOMMU Pagetable Support
-#
-# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
-# CONFIG_IPMMU_VMSA is not set
-# CONFIG_ARM_SMMU is not set
-
-#
-# Analog to digital converters
-#
-# CONFIG_ROCKCHIP_SARADC is not set
-
-#
-# Digital to analog converters
-#
-# CONFIG_MAX5821 is not set
-
-#
-# Pseudo filesystems
-#
-# CONFIG_HUGETLBFS is not set
-
-#
-# Lock Debugging (spinlocks, mutexes, etc...)
-#
-# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-
-#
-# Library routines
-#
-CONFIG_KVM_MMIO=y
-CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
-CONFIG_KVM=y
-CONFIG_KVM_ARM_HOST=y
-CONFIG_KVM_ARM_MAX_VCPUS=4
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index d05a93bc6..7a5c32780 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.1.7
-release    = 2
+release    = 3
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -95,7 +95,6 @@ build
 	if "%{DISTRO_ARCH}" == "armv7hl"
 		# Build the default unified kernel.
 		build_kernel_default = 1
-		build_kernel_lpae = 1
 
 		kernel_target = zImage
 	end
@@ -115,11 +114,6 @@ build
 		kernels += legacy
 	end
 
-	# Build lpae kernel
-	if "%{build_kernel_lpae}" == "1"
-		kernels += lpae
-	end
-
 	perf_make = make %{MAKETUNING} -C tools/perf V=1 WERROR=0 \
 		NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 \
 		NO_STRLCPY=1 NO_BIONIC=1 prefix=%{prefix} perfexecdir=lib/perf-core
@@ -550,22 +544,6 @@ packages
 		end
 	end
 
-	if "%{build_kernel_lpae}" == "1"
-		package kernel-lpae
-			template KERNEL
-
-			kernel_name = kernel-lpae
-			kernel_release = %{fullver}.lpae
-		end
-
-		package kernel-lpae-devel
-			template KERNELDEVEL
-
-			kernel_name = kernel-lpae
-			kernel_release = %{fullver}.lpae
-		end
-	end
-
 	package kernel-headers
 		summary = Header files of the kernel release %{fullver}.
 		desciption = %{summary}
diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index 7f9f2ee01..68a3c8a46 100755
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -17,7 +17,7 @@ CONFIGS="${CONFIGS} i686:legacy i686:default"
 CONFIGS="${CONFIGS} aarch64:default"
 
 # armv7hl
-CONFIGS="${CONFIGS} armv7hl:lpae armv7hl:default"
+CONFIGS="${CONFIGS} armv7hl:default"
 
 PLATFORMS="x86 arm"
 declare -A SUBPLATFORMS
@@ -129,10 +129,6 @@ function merge_config() {
 		armv7hl:default)
 			configs="${configs} config-arm-generic config-arm32-generic"
 			;;
-		armv7hl:lpae)
-			configs="${configs} config-arm-generic config-arm32-generic"
-			configs="${configs} config-armv7hl-lpae"
-			;;
 		*)
 			echo >&2 "ERROR: Invalid parameters given: $@"
 			return 1
@@ -240,9 +236,6 @@ function diff_configs() {
 
 		# Do not include leaf configuration.
 		case "${config}" in
-			armv7hl:lpae)
-				continue
-				;;
 			i686:legacy)
 				continue
 				;;