From fb1e5deaa1e0c00ba8043d9572ad74e3d25a91d5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 5 Apr 2022 09:14:49 +0200 Subject: [PATCH] ANDROID: remove CONFIG_DEBUG_INFO from gki_defconfig files As of commit f9b3cd245784 ("Kconfig.debug: make DEBUG_INFO selectable from a choice"), CONFIG_DEBUG_INFO is selected if any of the other DEBUG_INFO options is selected, so there is no need to have it explicitly called out in the gki_defconfig files (as savedefconfig will not contain it.) So remove it from the files, which fixes the build issues due to this change. Fixes: f9b3cd245784 ("Kconfig.debug: make DEBUG_INFO selectable from a choice") Signed-off-by: Greg Kroah-Hartman Change-Id: I663080c06c00c340f8b2ca544208f612b6aaad67 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9e176700d0c3..76c62431658a 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -646,7 +646,6 @@ CONFIG_STACK_HASH_ORDER=12 CONFIG_PRINTK_TIME=y CONFIG_PRINTK_CALLER=y CONFIG_DYNAMIC_DEBUG_CORE=y -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index c515c548c109..b946b4b3aacf 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -589,7 +589,6 @@ CONFIG_DMA_CMA=y CONFIG_STACK_HASH_ORDER=12 CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG_CORE=y -CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set