From f7a621270935c95a40464d3abee99d11251de1b6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 2 Jun 2014 03:11:19 +0000 Subject: [PATCH] Move CONFIG_KEXEC=y from more specific config files to kernelarch-{arm,mips}/config svn path=/dists/trunk/linux/; revision=21371 --- debian/config/armel/config.ixp4xx | 1 - debian/config/armel/config.kirkwood | 1 - debian/config/armel/config.mv78xx0 | 1 - debian/config/armel/config.orion5x | 1 - debian/config/armel/config.versatile | 1 - debian/config/armhf/config | 1 - debian/config/kernelarch-arm/config | 1 + debian/config/kernelarch-mips/config | 1 + debian/config/mips/config | 1 - debian/config/mipsel/config | 1 - 10 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index ea4ce4a37..9a9db1dbf 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -9,7 +9,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200" # CONFIG_XIP_KERNEL is not set -CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y # CONFIG_ARTHUR is not set diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 60d425a9d..bc9800a98 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -12,7 +12,6 @@ CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set -CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y CONFIG_FPE_NWFPE=y # CONFIG_FPE_NWFPE_XP is not set diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0 index ed4860be4..b7cfb981f 100644 --- a/debian/config/armel/config.mv78xx0 +++ b/debian/config/armel/config.mv78xx0 @@ -12,7 +12,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set -CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y CONFIG_FPE_NWFPE=y # CONFIG_FPE_NWFPE_XP is not set diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 3c5650cca..06726aad2 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -10,7 +10,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set -CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y CONFIG_VFP=y # CONFIG_ARTHUR is not set diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index d1fe41ec7..a4930f9a5 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -9,7 +9,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set -CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y CONFIG_FPE_NWFPE=y # CONFIG_FPE_NWFPE_XP is not set diff --git a/debian/config/armhf/config b/debian/config/armhf/config index a639ae4cc..c7674a18f 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -1,7 +1,6 @@ ## ## file: arch/arm/Kconfig ## -CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y #. Enable floating point unit CONFIG_VFP=y diff --git a/debian/config/kernelarch-arm/config b/debian/config/kernelarch-arm/config index aead6defe..8dca5ef81 100644 --- a/debian/config/kernelarch-arm/config +++ b/debian/config/kernelarch-arm/config @@ -4,6 +4,7 @@ CONFIG_MMU=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set +CONFIG_KEXEC=y ## ## file: arch/arm/Kconfig.debug diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config index d2bc59614..cd22ec8da 100644 --- a/debian/config/kernelarch-mips/config +++ b/debian/config/kernelarch-mips/config @@ -1,6 +1,7 @@ ## ## file: arch/mips/Kconfig ## +CONFIG_KEXEC=y CONFIG_SECCOMP=y ## diff --git a/debian/config/mips/config b/debian/config/mips/config index c9e43ed35..fefae90a5 100644 --- a/debian/config/mips/config +++ b/debian/config/mips/config @@ -5,7 +5,6 @@ CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_LITTLE_ENDIAN is not set ## end choice -CONFIG_KEXEC=y # CONFIG_RAPIDIO is not set ## diff --git a/debian/config/mipsel/config b/debian/config/mipsel/config index 32d1b154e..afec781d8 100644 --- a/debian/config/mipsel/config +++ b/debian/config/mipsel/config @@ -5,6 +5,5 @@ # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_LITTLE_ENDIAN=y ## end choice -CONFIG_KEXEC=y # CONFIG_RAPIDIO is not set