summaryrefslogtreecommitdiff
path: root/arch/arm/configs/multi_v5_defconfig
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2022-03-17 21:30:42 +0300
committerArnd Bergmann <arnd@arndb.de>2022-03-20 00:34:42 +0300
commit4bcf5f95c7fde202e75cfef8ae64dc7ec79f7d12 (patch)
treec949cfc0c86bbbf34575984a587a5d46154c97c0 /arch/arm/configs/multi_v5_defconfig
parent9c44d0805f949c56121b4ae6949fb064537bf198 (diff)
downloadlinux-4bcf5f95c7fde202e75cfef8ae64dc7ec79f7d12.tar.xz
ARM: configs: clean up multi_v5_defconfig
Clean up some cruft accumulated over time: - The default definition of CONFIG_ZBOOT_ROM_* got fixed in commit 39c3e304567a ("ARM: 8984/1: Kconfig: set default ZBOOT_ROM_TEXT/BSS value to 0x0"), so we don't need the explicit setting anymore. - CONFIG_ABX500_CORE now explicitly depends on the ARMv7 ARCH_U8500, so we don't need to disable that symbol explicitly anymore. - CONFIG_DEBUG_FS was just moved around in the generated defconfig. No change to the generated .config or savedefconfig. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Link: https://lore.kernel.org/r/20220317183043.948432-5-andre.przywara@arm.com' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/multi_v5_defconfig')
-rw-r--r--arch/arm/configs/multi_v5_defconfig5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index b85936f56ff4..a0df74a1a62e 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -54,8 +54,6 @@ CONFIG_MACH_RD88F5181L_FXO=y
CONFIG_MACH_RD88F6183AP_GE=y
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_CPU_FREQ=y
@@ -183,7 +181,6 @@ CONFIG_ORION_WATCHDOG=y
CONFIG_NPCM7XX_WATCHDOG=y
CONFIG_IMX2_WDT=y
CONFIG_MFD_ATMEL_HLCDC=y
-# CONFIG_ABX500_CORE is not set
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_SUPPORT=y
@@ -305,8 +302,8 @@ CONFIG_CRYPTO_DEV_MARVELL_CESA=y
CONFIG_CRC_CCITT=y
CONFIG_LIBCRC32C=y
CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_FS=y
CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
CONFIG_DEBUG_KERNEL=y
# CONFIG_SCHED_DEBUG is not set
# CONFIG_DEBUG_PREEMPT is not set