Move CONFIG_KEXEC=y from more specific config files to kernelarch-{arm,mips}/config
svn path=/dists/trunk/linux/; revision=21371
This commit is contained in:
parent
ffab96be34
commit
f7a6212709
|
@ -9,7 +9,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||||
CONFIG_CMDLINE="console=ttyS0,115200"
|
CONFIG_CMDLINE="console=ttyS0,115200"
|
||||||
# CONFIG_XIP_KERNEL is not set
|
# CONFIG_XIP_KERNEL is not set
|
||||||
CONFIG_KEXEC=y
|
|
||||||
CONFIG_ATAGS_PROC=y
|
CONFIG_ATAGS_PROC=y
|
||||||
# CONFIG_ARTHUR is not set
|
# CONFIG_ARTHUR is not set
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@ CONFIG_ARM_APPENDED_DTB=y
|
||||||
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
||||||
CONFIG_CMDLINE=""
|
CONFIG_CMDLINE=""
|
||||||
# CONFIG_XIP_KERNEL is not set
|
# CONFIG_XIP_KERNEL is not set
|
||||||
CONFIG_KEXEC=y
|
|
||||||
CONFIG_ATAGS_PROC=y
|
CONFIG_ATAGS_PROC=y
|
||||||
CONFIG_FPE_NWFPE=y
|
CONFIG_FPE_NWFPE=y
|
||||||
# CONFIG_FPE_NWFPE_XP is not set
|
# CONFIG_FPE_NWFPE_XP is not set
|
||||||
|
|
|
@ -12,7 +12,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||||
CONFIG_CMDLINE=""
|
CONFIG_CMDLINE=""
|
||||||
# CONFIG_XIP_KERNEL is not set
|
# CONFIG_XIP_KERNEL is not set
|
||||||
CONFIG_KEXEC=y
|
|
||||||
CONFIG_ATAGS_PROC=y
|
CONFIG_ATAGS_PROC=y
|
||||||
CONFIG_FPE_NWFPE=y
|
CONFIG_FPE_NWFPE=y
|
||||||
# CONFIG_FPE_NWFPE_XP is not set
|
# CONFIG_FPE_NWFPE_XP is not set
|
||||||
|
|
|
@ -10,7 +10,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||||
CONFIG_CMDLINE=""
|
CONFIG_CMDLINE=""
|
||||||
# CONFIG_XIP_KERNEL is not set
|
# CONFIG_XIP_KERNEL is not set
|
||||||
CONFIG_KEXEC=y
|
|
||||||
CONFIG_ATAGS_PROC=y
|
CONFIG_ATAGS_PROC=y
|
||||||
CONFIG_VFP=y
|
CONFIG_VFP=y
|
||||||
# CONFIG_ARTHUR is not set
|
# CONFIG_ARTHUR is not set
|
||||||
|
|
|
@ -9,7 +9,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||||
CONFIG_CMDLINE=""
|
CONFIG_CMDLINE=""
|
||||||
# CONFIG_XIP_KERNEL is not set
|
# CONFIG_XIP_KERNEL is not set
|
||||||
CONFIG_KEXEC=y
|
|
||||||
CONFIG_ATAGS_PROC=y
|
CONFIG_ATAGS_PROC=y
|
||||||
CONFIG_FPE_NWFPE=y
|
CONFIG_FPE_NWFPE=y
|
||||||
# CONFIG_FPE_NWFPE_XP is not set
|
# CONFIG_FPE_NWFPE_XP is not set
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
##
|
##
|
||||||
## file: arch/arm/Kconfig
|
## file: arch/arm/Kconfig
|
||||||
##
|
##
|
||||||
CONFIG_KEXEC=y
|
|
||||||
CONFIG_ATAGS_PROC=y
|
CONFIG_ATAGS_PROC=y
|
||||||
#. Enable floating point unit
|
#. Enable floating point unit
|
||||||
CONFIG_VFP=y
|
CONFIG_VFP=y
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
CONFIG_MMU=y
|
CONFIG_MMU=y
|
||||||
CONFIG_AEABI=y
|
CONFIG_AEABI=y
|
||||||
# CONFIG_OABI_COMPAT is not set
|
# CONFIG_OABI_COMPAT is not set
|
||||||
|
CONFIG_KEXEC=y
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: arch/arm/Kconfig.debug
|
## file: arch/arm/Kconfig.debug
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
##
|
##
|
||||||
## file: arch/mips/Kconfig
|
## file: arch/mips/Kconfig
|
||||||
##
|
##
|
||||||
|
CONFIG_KEXEC=y
|
||||||
CONFIG_SECCOMP=y
|
CONFIG_SECCOMP=y
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
CONFIG_CPU_BIG_ENDIAN=y
|
CONFIG_CPU_BIG_ENDIAN=y
|
||||||
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
# CONFIG_CPU_LITTLE_ENDIAN is not set
|
||||||
## end choice
|
## end choice
|
||||||
CONFIG_KEXEC=y
|
|
||||||
# CONFIG_RAPIDIO is not set
|
# CONFIG_RAPIDIO is not set
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|
|
@ -5,6 +5,5 @@
|
||||||
# CONFIG_CPU_BIG_ENDIAN is not set
|
# CONFIG_CPU_BIG_ENDIAN is not set
|
||||||
CONFIG_CPU_LITTLE_ENDIAN=y
|
CONFIG_CPU_LITTLE_ENDIAN=y
|
||||||
## end choice
|
## end choice
|
||||||
CONFIG_KEXEC=y
|
|
||||||
# CONFIG_RAPIDIO is not set
|
# CONFIG_RAPIDIO is not set
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue