From 48ef6697596abda22d3a6bc964c4e1efa3fc2c52 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 17 Sep 2022 00:09:27 +0200 Subject: [PATCH] apm821xx: refresh 5.15 config use the toolchain's default CPU (464fp) as the CPU option. This fixes a CPU selection prompt which shows up now. CPU selection > 1. Generic 32 bits powerpc (POWERPC_CPU) (NEW) 2. Rely on the toolchain's implicit default CPU (TOOLCHAIN_DEFAULT_CPU) (NEW) Signed-off-by: Christian Lamparter --- target/linux/apm821xx/config-5.15 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/apm821xx/config-5.15 b/target/linux/apm821xx/config-5.15 index 7cb81d7fdd..2af8110553 100644 --- a/target/linux/apm821xx/config-5.15 +++ b/target/linux/apm821xx/config-5.15 @@ -38,7 +38,6 @@ CONFIG_CPU_BIG_ENDIAN=y CONFIG_CRC16=y # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_SLICEBY8=y -CONFIG_CRYPTO_BLAKE2S=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DEV_PPC4XX=y CONFIG_CRYPTO_HW=y @@ -76,7 +75,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_CPU=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_GETTIMEOFDAY=y @@ -180,6 +178,7 @@ CONFIG_PHYSICAL_START=0x00000000 CONFIG_PHYS_64BIT=y CONFIG_PHYS_ADDR_T_64BIT=y # CONFIG_PMU_SYSFS is not set +# CONFIG_POWERPC_CPU is not set CONFIG_PPC=y CONFIG_PPC32=y CONFIG_PPC44x_SIMPLE=y @@ -233,6 +232,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_THREAD_SHIFT=13 CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y +CONFIG_TOOLCHAIN_DEFAULT_CPU=y CONFIG_USB_SUPPORT=y CONFIG_VDSO32=y # CONFIG_VIRTIO_MENU is not set -- 2.30.2