summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/clps711x_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-07-20 14:47:57 +0200
committerArnd Bergmann <arnd@arndb.de>2022-07-22 12:33:30 +0200
commit2002f3968714e5426fa97399b24fac3db66a7f06 (patch)
tree76ce9ebf334b230050a137aee1b9ba683338d2a9 /arch/arm/configs/clps711x_defconfig
parentMerge tag 'qcom-arm64-defconfig-for-5.20-2' of git://git.kernel.org/pub/scm/l... (diff)
downloadlinux-2002f3968714e5426fa97399b24fac3db66a7f06.tar.xz
linux-2002f3968714e5426fa97399b24fac3db66a7f06.zip
ARM: refresh defconfig files
A lot of Kconfig options have changed over the years, and we tend to not do a blind 'make defconfig' to refresh the files, to ensure we catch options that should not have gone away. I used some a bit of scripting to only rework the bits where an option moved around in any of the defconfig files, without also dropping any of the other lines, to make it clearer which options we no longer have. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/clps711x_defconfig')
-rw-r--r--arch/arm/configs/clps711x_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/clps711x_defconfig b/arch/arm/configs/clps711x_defconfig
index 63a153f5cf68..b56d82d4eacd 100644
--- a/arch/arm/configs/clps711x_defconfig
+++ b/arch/arm/configs/clps711x_defconfig
@@ -4,7 +4,6 @@ CONFIG_LOG_BUF_SHIFT=14
CONFIG_BLK_DEV_INITRD=y
CONFIG_RD_LZMA=y
CONFIG_EMBEDDED=y
-CONFIG_SLOB=y
CONFIG_JUMP_LABEL=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_CLPS711X=y
@@ -17,6 +16,7 @@ CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
# CONFIG_COREDUMP is not set
+CONFIG_SLOB=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y