Commit 92f89ec1 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Restore CONFIG_DEBUG_INFO in defconfigs 



Commit f9b3cd24 ("Kconfig.debug: make DEBUG_INFO selectable from a
choice") broke the selection of CONFIG_DEBUG_INFO by powerpc defconfigs.

It is now necessary to select one of the three DEBUG_INFO_DWARF*
options to get DEBUG_INFO enabled.

Replace DEBUG_INFO=y by DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y in all
defconfigs using the following command:

sed -i s/DEBUG_INFO=y/DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y/g `git grep -l DEBUG_INFO arch/powerpc/configs/`

Fixes: f9b3cd24 ("Kconfig.debug: make DEBUG_INFO selectable from a choice")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/98a4c2603bf9e4b776e219f5b8541d23aa24e854.1654930308.git.christophe.leroy@csgroup.eu
parent 78f1c24a

arch/powerpc/configs/44x/akebono_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ CONFIG_CRAMFS=y 
CONFIG_NLS_DEFAULT="n"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_XMON=y

arch/powerpc/configs/44x/currituck_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ CONFIG_NFS_FS=y 
CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NLS_DEFAULT="n"

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_XMON=y

arch/powerpc/configs/44x/fsp2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ CONFIG_XZ_DEC=y 
CONFIG_PRINTK_TIME=y

CONFIG_MESSAGE_LOGLEVEL_DEFAULT=3

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_CRYPTO_CBC=y

arch/powerpc/configs/44x/iss476-smp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ CONFIG_PROC_KCORE=y 
CONFIG_TMPFS=y

CONFIG_CRAMFS=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_PPC_EARLY_DEBUG=y

arch/powerpc/configs/44x/warp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ CONFIG_NLS_UTF8=y 
CONFIG_CRC_CCITT=y

CONFIG_CRC_T10DIF=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y