[openwrt/openwrt] mpc85xx: kernel: refresh 6.1 config

Fri Mar 8 08:51:25 PST 2024

chunkeey pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/894ff58067798ebe859dd9a2fe92ebf95765ac36

commit 894ff58067798ebe859dd9a2fe92ebf95765ac36
Author: Pawel Dembicki <paweldembicki at gmail.com>
AuthorDate: Tue Nov 21 10:45:22 2023 +0100

    mpc85xx: kernel: refresh 6.1 config
    
    Kernel config needs to be refreshed after copy from 5.15.
    
    Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com>
---
 target/linux/mpc85xx/config-6.1 | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/target/linux/mpc85xx/config-6.1 b/target/linux/mpc85xx/config-6.1
index aeeeedad85..149518971f 100644
--- a/target/linux/mpc85xx/config-6.1
+++ b/target/linux/mpc85xx/config-6.1
@@ -12,6 +12,9 @@ CONFIG_ARCH_MMAP_RND_BITS_MAX=17
 CONFIG_ARCH_MMAP_RND_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
+CONFIG_ARCH_SPLIT_ARG64=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WEAK_RELEASE_ACQUIRE=y
@@ -19,17 +22,21 @@ CONFIG_ASN1=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BOOKE=y
+CONFIG_BOOKE_OR_40x=y
 CONFIG_BOOKE_WDT=y
 # CONFIG_BR200_WP is not set
 # CONFIG_BSC9131_RDB is not set
 # CONFIG_BSC9132_QDS is not set
 # CONFIG_C293_PCIE is not set
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_CLZ_TAB=y
 CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_COMMON_CLK is not set
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 CONFIG_COMPAT_32BIT_TIME=y
 # CONFIG_CORENET_GENERIC is not set
 # CONFIG_CPM2 is not set
@@ -39,6 +46,8 @@ CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_UTILS=y
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
@@ -46,11 +55,11 @@ CONFIG_CRYPTO_RSA=y
 # CONFIG_CRYPTO_SHA1_PPC is not set
 # CONFIG_CRYPTO_SHA1_PPC_SPE is not set
 # CONFIG_CRYPTO_SHA256_PPC_SPE is not set
-CONFIG_DATA_SHIFT=12
+CONFIG_DATA_SHIFT=24
 CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
 CONFIG_DNOTIFY=y
 CONFIG_DTC=y
-CONFIG_E500=y
 CONFIG_E500_CPU=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_EDAC=y
@@ -59,9 +68,10 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_LEGACY_SYSFS=y
 CONFIG_EDAC_MPC85XX=y
 CONFIG_EDAC_SUPPORT=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 # CONFIG_FIREBOX_T10 is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FSL_BOOKE=y
+# CONFIG_FSL_DPAA2_SWITCH is not set
 CONFIG_FSL_EMB_PERFMON=y
 # CONFIG_FSL_FMAN is not set
 CONFIG_FSL_LBC=y
@@ -71,6 +81,8 @@ CONFIG_FSL_SOC=y
 CONFIG_FSL_SOC_BOOKE=y
 CONFIG_FWNODE_MDIO=y
 CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
@@ -115,7 +127,7 @@ CONFIG_KERNEL_START=0xc0000000
 # CONFIG_KSI8560 is not set
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOWMEM_CAM_NUM=3
+CONFIG_LOWMEM_CAM_NUM=9
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LXT_PHY=y
 # CONFIG_MATH_EMULATION is not set
@@ -124,6 +136,7 @@ CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_DEVRES=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_MIGRATION=y
+CONFIG_MMU_GATHER_MERGE_VMAS=y
 CONFIG_MMU_GATHER_PAGE_SIZE=y
 CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MPC8536_DS is not set
@@ -168,6 +181,9 @@ CONFIG_OLD_SIGSUSPEND=y
 # CONFIG_P1022_RDK is not set
 # CONFIG_P1023_RDB is not set
 CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
 # CONFIG_PANDA is not set
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
@@ -195,22 +211,27 @@ CONFIG_PPC_ADV_DEBUG_DVCS=0
 CONFIG_PPC_ADV_DEBUG_IACS=2
 CONFIG_PPC_ADV_DEBUG_REGS=y
 CONFIG_PPC_BARRIER_NOSPEC=y
-CONFIG_PPC_BOOK3E_MMU=y
 # CONFIG_PPC_BOOK3S_32 is not set
 CONFIG_PPC_DOORBELL=y
+CONFIG_PPC_E500=y
 # CONFIG_PPC_E500MC is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
-CONFIG_PPC_FSL_BOOK3E=y
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PPC_KUAP=y
+# CONFIG_PPC_KUAP_DEBUG is not set
+CONFIG_PPC_KUEP=y
 CONFIG_PPC_MMU_NOHASH=y
 CONFIG_PPC_PAGE_SHIFT=12
+# CONFIG_PPC_PCI_BUS_NUM_DOMAIN_DEPENDENT is not set
 # CONFIG_PPC_QEMU_E500 is not set
 CONFIG_PPC_SMP_MUXED_IPI=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_PPC_WERROR=y
+CONFIG_PREEMPT_NONE_BUILD=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_QE_GPIO=y
 CONFIG_QUICC_ENGINE=y
+CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RAS=y
 # CONFIG_RED_15W_REV1 is not set
 CONFIG_RTC_CLASS=y
@@ -225,6 +246,7 @@ CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_QE is not set
 # CONFIG_SOCRATES is not set
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPE=y
 CONFIG_SPE_POSSIBLE=y
@@ -233,6 +255,7 @@ CONFIG_SPI_FSL_ESPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
 CONFIG_SRCU=y
+# CONFIG_STATIC_CALL_SELFTEST is not set
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_STX_GP3 is not set
 CONFIG_SWPHY=y


