From 8ee0d16894de4c7fbb5bcb4e5a02066c7921a7c5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Fri, 1 Nov 2024 23:08:43 +0000 Subject: [PATCH] configs: Regenerate defconfigs Signed-off-by: Phil Elwell --- arch/arm/configs/bcm2709_defconfig | 1 - arch/arm/configs/bcm2711_defconfig | 1 - arch/arm/configs/bcmrpi_defconfig | 1 - arch/arm64/configs/bcm2711_defconfig | 3 +-- arch/arm64/configs/bcm2712_defconfig | 3 +-- arch/arm64/configs/bcmrpi3_defconfig | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig index 03c8335f9dfff2..a18bf5a384f6cd 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -67,7 +67,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_BINFMT_MISC=m CONFIG_ZSWAP=y -CONFIG_Z3FOLD=m # CONFIG_COMPAT_BRK is not set CONFIG_CMA=y CONFIG_LRU_GEN=y diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig index 7966e173400f96..c51b8ff05e1e18 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -68,7 +68,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_BINFMT_MISC=m CONFIG_ZSWAP=y -CONFIG_Z3FOLD=m # CONFIG_COMPAT_BRK is not set CONFIG_CMA=y CONFIG_LRU_GEN=y diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig index 97b470574c69c7..cf2025bc08221d 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -62,7 +62,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_BINFMT_MISC=m CONFIG_ZSWAP=y -CONFIG_Z3FOLD=m # CONFIG_COMPAT_BRK is not set CONFIG_CMA=y CONFIG_LRU_GEN=y diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 77aea0652ef1f5..208e0850ed0950 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -43,6 +43,7 @@ CONFIG_ARCH_BRCMSTB=y # CONFIG_CAVIUM_ERRATUM_27456 is not set CONFIG_HOTPLUG_CPU=y CONFIG_NUMA=y +CONFIG_NUMA_EMULATION=y CONFIG_COMPAT=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y @@ -77,7 +78,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_BINFMT_MISC=m CONFIG_ZSWAP=y -CONFIG_Z3FOLD=m # CONFIG_COMPAT_BRK is not set CONFIG_CMA=y CONFIG_LRU_GEN=y @@ -1695,4 +1695,3 @@ CONFIG_SCHED_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_UPROBE_EVENTS is not set # CONFIG_STRICT_DEVMEM is not set -CONFIG_NUMA_EMULATION=y diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig index 328e135816f606..a35322a398115d 100644 --- a/arch/arm64/configs/bcm2712_defconfig +++ b/arch/arm64/configs/bcm2712_defconfig @@ -44,6 +44,7 @@ CONFIG_ARCH_BRCMSTB=y CONFIG_ARM64_16K_PAGES=y CONFIG_HOTPLUG_CPU=y CONFIG_NUMA=y +CONFIG_NUMA_EMULATION=y CONFIG_COMPAT=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y @@ -80,7 +81,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_BINFMT_MISC=m CONFIG_ZSWAP=y -CONFIG_Z3FOLD=m # CONFIG_COMPAT_BRK is not set CONFIG_CMA=y CONFIG_LRU_GEN=y @@ -1698,4 +1698,3 @@ CONFIG_SCHED_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_UPROBE_EVENTS is not set # CONFIG_STRICT_DEVMEM is not set -CONFIG_NUMA_EMULATION=y diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig index f7a5ccd694e594..c584cbfc66f283 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -70,7 +70,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_BINFMT_MISC=y CONFIG_ZSWAP=y -CONFIG_Z3FOLD=m # CONFIG_COMPAT_BRK is not set CONFIG_CMA=y CONFIG_LRU_GEN=y