summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCyril Bur <cyrilbur@gmail.com>2015-05-26 11:36:56 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2015-06-02 16:54:48 +1000
commita1c97df2787f6542257f1fd85e6a9b055e1125be (patch)
tree9a012d7faf2b58b996ebe96697a6eedfcf5b9bd6 /arch
parentc1231a784acc25ec01d35a019533da9ab8593e2e (diff)
downloadlinux-a1c97df2787f6542257f1fd85e6a9b055e1125be.tar.bz2
powerpc/configs: Merge pseries_defconfig and pseries_le_defconfig
These two configs should be identical with the exception of big or little endian. The big endian version has XMON_DEFAULT turned on while the little endian has XMON_DEFAULT not set. It makes the most sense for defconfigs not to use xmon by default, production systems should get back up as quickly as possible, not sit in xmon. In the event debugging is required, the option can be enabled or xmon=on can be specified on commandline. Signed-off-by: Cyril Bur <cyrilbur@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/configs/pseries_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index c2e39f66b182..4da826004ef8 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -297,7 +297,6 @@ CONFIG_CODE_PATCHING_SELFTEST=y
CONFIG_FTR_FIXUP_SELFTEST=y
CONFIG_MSI_BITMAP_SELFTEST=y
CONFIG_XMON=y
-CONFIG_XMON_DEFAULT=y
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_HMAC=y