diff options
author | Alistair Popple <alistair@popple.id.au> | 2013-04-28 23:42:44 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-06-20 02:55:12 -0400 |
commit | b9ef7d6b11c120cc402a76013062061bbe0fbaad (patch) | |
tree | f15f83fae70c2ea72c2c3a06abfcf99b3d236c8e | |
parent | 071df9422ac91c0d290e81f5ae2635c74cda6d00 (diff) |
powerpc: Update default configurations
Update default configurations for systems with CONFIG_BOOTX_TEXT
selected so that they continue to print early debug messages as is
currently the case.
Signed-off-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/configs/c2k_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/g5_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/maple_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/pmac32_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc6xx_defconfig | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index 2a84fd7f631c..671a8f960afa 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_defconfig | |||
@@ -423,6 +423,8 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
423 | CONFIG_DEBUG_STACKOVERFLOW=y | 423 | CONFIG_DEBUG_STACKOVERFLOW=y |
424 | CONFIG_DEBUG_STACK_USAGE=y | 424 | CONFIG_DEBUG_STACK_USAGE=y |
425 | CONFIG_BOOTX_TEXT=y | 425 | CONFIG_BOOTX_TEXT=y |
426 | CONFIG_PPC_EARLY_DEBUG=y | ||
427 | CONFIG_PPC_EARLY_DEBUG_BOOTX=y | ||
426 | CONFIG_KEYS=y | 428 | CONFIG_KEYS=y |
427 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 429 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
428 | CONFIG_SECURITY=y | 430 | CONFIG_SECURITY=y |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 07b7f2af2dca..1ea22fc24ea8 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
@@ -284,6 +284,8 @@ CONFIG_DEBUG_MUTEXES=y | |||
284 | CONFIG_LATENCYTOP=y | 284 | CONFIG_LATENCYTOP=y |
285 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 285 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
286 | CONFIG_BOOTX_TEXT=y | 286 | CONFIG_BOOTX_TEXT=y |
287 | CONFIG_PPC_EARLY_DEBUG=y | ||
288 | CONFIG_PPC_EARLY_DEBUG_BOOTX=y | ||
287 | CONFIG_CRYPTO_NULL=m | 289 | CONFIG_CRYPTO_NULL=m |
288 | CONFIG_CRYPTO_TEST=m | 290 | CONFIG_CRYPTO_TEST=m |
289 | CONFIG_CRYPTO_ECB=m | 291 | CONFIG_CRYPTO_ECB=m |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 02ac96b679b8..2a5afac29861 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
@@ -138,6 +138,8 @@ CONFIG_DEBUG_STACK_USAGE=y | |||
138 | CONFIG_XMON=y | 138 | CONFIG_XMON=y |
139 | CONFIG_XMON_DEFAULT=y | 139 | CONFIG_XMON_DEFAULT=y |
140 | CONFIG_BOOTX_TEXT=y | 140 | CONFIG_BOOTX_TEXT=y |
141 | CONFIG_PPC_EARLY_DEBUG=y | ||
142 | CONFIG_PPC_EARLY_DEBUG_BOOTX=y | ||
141 | CONFIG_CRYPTO_ECB=m | 143 | CONFIG_CRYPTO_ECB=m |
142 | CONFIG_CRYPTO_PCBC=m | 144 | CONFIG_CRYPTO_PCBC=m |
143 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 145 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 29767a8dfea5..a73626b09051 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
@@ -350,6 +350,8 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
350 | CONFIG_XMON=y | 350 | CONFIG_XMON=y |
351 | CONFIG_XMON_DEFAULT=y | 351 | CONFIG_XMON_DEFAULT=y |
352 | CONFIG_BOOTX_TEXT=y | 352 | CONFIG_BOOTX_TEXT=y |
353 | CONFIG_PPC_EARLY_DEBUG=y | ||
354 | CONFIG_PPC_EARLY_DEBUG_BOOTX=y | ||
353 | CONFIG_CRYPTO_NULL=m | 355 | CONFIG_CRYPTO_NULL=m |
354 | CONFIG_CRYPTO_PCBC=m | 356 | CONFIG_CRYPTO_PCBC=m |
355 | CONFIG_CRYPTO_MD4=m | 357 | CONFIG_CRYPTO_MD4=m |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index aef3f71de5ad..c86fcb92358e 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -398,6 +398,8 @@ CONFIG_FTR_FIXUP_SELFTEST=y | |||
398 | CONFIG_MSI_BITMAP_SELFTEST=y | 398 | CONFIG_MSI_BITMAP_SELFTEST=y |
399 | CONFIG_XMON=y | 399 | CONFIG_XMON=y |
400 | CONFIG_BOOTX_TEXT=y | 400 | CONFIG_BOOTX_TEXT=y |
401 | CONFIG_PPC_EARLY_DEBUG=y | ||
402 | CONFIG_PPC_EARLY_DEBUG_BOOTX=y | ||
401 | CONFIG_CRYPTO_NULL=m | 403 | CONFIG_CRYPTO_NULL=m |
402 | CONFIG_CRYPTO_TEST=m | 404 | CONFIG_CRYPTO_TEST=m |
403 | CONFIG_CRYPTO_PCBC=m | 405 | CONFIG_CRYPTO_PCBC=m |
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index be1cb6ea3a36..20ebfaf7234b 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig | |||
@@ -1264,6 +1264,8 @@ CONFIG_DEBUG_STACKOVERFLOW=y | |||
1264 | CONFIG_DEBUG_STACK_USAGE=y | 1264 | CONFIG_DEBUG_STACK_USAGE=y |
1265 | CONFIG_XMON=y | 1265 | CONFIG_XMON=y |
1266 | CONFIG_BOOTX_TEXT=y | 1266 | CONFIG_BOOTX_TEXT=y |
1267 | CONFIG_PPC_EARLY_DEBUG=y | ||
1268 | CONFIG_PPC_EARLY_DEBUG_BOOTX=y | ||
1267 | CONFIG_KEYS=y | 1269 | CONFIG_KEYS=y |
1268 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1270 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1269 | CONFIG_SECURITY=y | 1271 | CONFIG_SECURITY=y |