kernel: Disable LPAE on ARM - create uImage.

LPAE has been enabled on all ARMv7 platforms, but
OMAP4 (at least) does not support that, so the kernels
did not boot.

Also, we directly generate u-boot images.

diff --git a/kernel/config-armv7hl-exynos b/kernel/config-armv7hl-exynos
index a31f8d166926515c4be47080b7d04f28181f0d22..ba0656e86e126496fefb34305397de241ad44b56 100644 (file)
--- a/kernel/config-armv7hl-exynos
+++ b/kernel/config-armv7hl-exynos
@@ -157,8 +157,7 @@ CONFIG_CPU_HAS_ASID=y
 #
 # Processor Features
 #
-CONFIG_ARM_LPAE=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+# CONFIG_ARM_LPAE is not set
 # CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
@@ -218,7 +217,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_PHYS_ADDR_T_64BIT=y
 
 #
 # Boot options
@@ -665,10 +663,12 @@ CONFIG_PAX_PAGEEXEC=y
 CONFIG_PAX_MPROTECT=y
 # CONFIG_PAX_MPROTECT_COMPAT is not set
 CONFIG_PAX_ELFRELOCS=y
+# CONFIG_PAX_KERNEXEC is not set
 
 #
 # Miscellaneous hardening features
 #
+# CONFIG_PAX_MEMORY_UDEREF is not set
 CONFIG_PAX_REFCOUNT=y
 
 #

diff --git a/kernel/config-armv7hl-omap b/kernel/config-armv7hl-omap
index 1f69140647bd7a9bb3cd6beb9d11ae3efa4ec5df..73de6030b48fded146dbef882a7bab7a5bc2ec9d 100644 (file)
--- a/kernel/config-armv7hl-omap
+++ b/kernel/config-armv7hl-omap
@@ -128,9 +128,8 @@ CONFIG_CPU_HAS_ASID=y
 #
 # Processor Features
 #
-CONFIG_ARM_LPAE=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARM_THUMBEE=y
+# CONFIG_ARM_LPAE is not set
+# CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -183,7 +182,6 @@ CONFIG_HZ=128
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_XEN_DOM0=y

diff --git a/kernel/config-generic b/kernel/config-generic
index 40feeba28aec9c3d95b1c6a041a7d8c81607e1ea..074a90cf4a7a380b37c972c473bc9b2b1324daf1 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -3973,10 +3973,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
@@ -4096,6 +4093,7 @@ CONFIG_PAX_RANDMMAP=y
 #
 # Miscellaneous hardening features
 #
+CONFIG_PAX_CONSTIFY_PLUGIN=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_PAX_LATENT_ENTROPY is not set
 

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index b9215c4706c83a2e9a55443c6a56d671b50d627a..16c5b59dab83bac60572dc9245ee99096ab17857 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 3.8.3
-release    = 1
+release    = 2
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
@@ -72,22 +72,21 @@ build
        kernel_build_flags =
 
        kernel_target = bzImage
+       kernel_image = arch/%{kernel_arch}/boot/%{kernel_target}
+
        if "%{DISTRO_ARCH}" == "i686"
                # Build a default and legacy kernel for the
                # i686 architecture.
                build_kernel_default = 1
                build_kernel_legacy = 1
 
-               kernel_arch  = x86
-               kernel_image = arch/%{kernel_arch}/boot/bzImage
-
+               kernel_arch = x86
        end
 
        if "%{DISTRO_ARCH}" == "x86_64"
                build_kernel_default = 1
 
-               kernel_arch  = x86
-               kernel_image = arch/%{kernel_arch}/boot/bzImage
+               kernel_arch = x86
        end
 
        if "%{DISTRO_ARCH}" == "armv5tel"
@@ -97,8 +96,8 @@ build
                # Build a kernel for Marvell Kirkwood-based devices.
                build_kernel_kirkwood = 1
 
-               kernel_arch  = arm
-               kernel_image = arch/%{kernel_arch}/boot/zImage
+               kernel_arch = arm
+               kernel_target = zImage
 
                # http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/091404.html
                kernel_build_flags = KALLSYMS_EXTRA_PASS=1
@@ -111,8 +110,13 @@ build
                # Build a kernel for TI OMAP SoCs.
                build_kernel_omap = 1
 
-               kernel_arch  = arm
-               kernel_image = arch/%{kernel_arch}/boot/zImage
+               kernel_arch = arm
+               kernel_target = uImage
+       end
+
+       # mkimage is a requirement to build uImage images.
+       if "%{kernel_target}" == "uImage"
+               requires += u-boot-tools
        end
 
        # Build default kernel.