| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Sat, 15 Dec 2018 00:57:11 +1100 |
| Subject: powerpc/configs: Don't enable PPC_EARLY_DEBUG in defconfigs |
| |
| commit 2b874a5c7b75fdc90fdd1e2ffaa3ec5a9d21e253 upstream. |
| |
| This reverts the remains of commit b9ef7d6b11c1 ("powerpc: Update |
| default configurations"). |
| |
| That commit was proceeded by a commit which added a config option to |
| control use of BOOTX for early debug, ie. PPC_EARLY_DEBUG_BOOTX, and |
| then the update of the defconfigs was intended to not change behaviour |
| by then enabling the new config option. |
| |
| However enabling PPC_EARLY_DEBUG had other consequences, notably |
| causing us to register the udbg console at the end of udbg_early_init(). |
| |
| This means on a system which doesn't have anything that BOOTX can |
| use (most systems), we register the udbg console very early but the |
| bootx code just throws everything away, meaning early boot messages |
| are never printed to the console. |
| |
| What we want to happen is for the udbg console to only be registered |
| later (from setup_arch()) once we've setup udbg_putc, and then all |
| early boot messages will be replayed. |
| |
| Fixes: b9ef7d6b11c1 ("powerpc: Update default configurations") |
| Reported-by: Torsten Duwe <duwe@lst.de> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| [bwh: Backported to 3.16: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/powerpc/configs/g5_defconfig | 1 - |
| arch/powerpc/configs/maple_defconfig | 1 - |
| arch/powerpc/configs/pmac32_defconfig | 1 - |
| arch/powerpc/configs/ppc64_defconfig | 1 - |
| arch/powerpc/configs/ppc6xx_defconfig | 1 - |
| 5 files changed, 5 deletions(-) |
| |
| --- a/arch/powerpc/configs/g5_defconfig |
| +++ b/arch/powerpc/configs/g5_defconfig |
| @@ -283,7 +283,6 @@ CONFIG_DEBUG_MUTEXES=y |
| CONFIG_LATENCYTOP=y |
| CONFIG_SYSCTL_SYSCALL_CHECK=y |
| CONFIG_BOOTX_TEXT=y |
| -CONFIG_PPC_EARLY_DEBUG=y |
| CONFIG_PPC_EARLY_DEBUG_BOOTX=y |
| CONFIG_CRYPTO_NULL=m |
| CONFIG_CRYPTO_TEST=m |
| --- a/arch/powerpc/configs/maple_defconfig |
| +++ b/arch/powerpc/configs/maple_defconfig |
| @@ -137,7 +137,6 @@ CONFIG_DEBUG_STACK_USAGE=y |
| CONFIG_XMON=y |
| CONFIG_XMON_DEFAULT=y |
| CONFIG_BOOTX_TEXT=y |
| -CONFIG_PPC_EARLY_DEBUG=y |
| CONFIG_PPC_EARLY_DEBUG_BOOTX=y |
| CONFIG_CRYPTO_ECB=m |
| CONFIG_CRYPTO_PCBC=m |
| --- a/arch/powerpc/configs/pmac32_defconfig |
| +++ b/arch/powerpc/configs/pmac32_defconfig |
| @@ -349,7 +349,6 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y |
| CONFIG_XMON=y |
| CONFIG_XMON_DEFAULT=y |
| CONFIG_BOOTX_TEXT=y |
| -CONFIG_PPC_EARLY_DEBUG=y |
| CONFIG_PPC_EARLY_DEBUG_BOOTX=y |
| CONFIG_CRYPTO_NULL=m |
| CONFIG_CRYPTO_PCBC=m |
| --- a/arch/powerpc/configs/ppc64_defconfig |
| +++ b/arch/powerpc/configs/ppc64_defconfig |
| @@ -339,7 +339,6 @@ CONFIG_FTR_FIXUP_SELFTEST=y |
| CONFIG_MSI_BITMAP_SELFTEST=y |
| CONFIG_XMON=y |
| CONFIG_BOOTX_TEXT=y |
| -CONFIG_PPC_EARLY_DEBUG=y |
| CONFIG_CRYPTO_TEST=m |
| CONFIG_CRYPTO_PCBC=m |
| CONFIG_CRYPTO_HMAC=y |
| --- a/arch/powerpc/configs/ppc6xx_defconfig |
| +++ b/arch/powerpc/configs/ppc6xx_defconfig |
| @@ -1261,7 +1261,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y |
| CONFIG_DEBUG_STACK_USAGE=y |
| CONFIG_XMON=y |
| CONFIG_BOOTX_TEXT=y |
| -CONFIG_PPC_EARLY_DEBUG=y |
| CONFIG_PPC_EARLY_DEBUG_BOOTX=y |
| CONFIG_KEYS=y |
| CONFIG_KEYS_DEBUG_PROC_KEYS=y |