diff --git a/target/linux/qoriq/config-6.18 b/target/linux/qoriq/config-6.18
index edd528698bc..b0d4280aa1d 100644
--- a/target/linux/qoriq/config-6.18
+++ b/target/linux/qoriq/config-6.18
@@ -25,7 +25,6 @@ CONFIG_ATA=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_PM=y
 CONFIG_BOOKE=y
 CONFIG_BOOKE_WDT=y
@@ -60,11 +59,10 @@ CONFIG_CPU_ISOLATION=y
 CONFIG_CPU_MITIGATIONS=y
 CONFIG_CPU_RMAP=y
 CONFIG_CRC16=y
+CONFIG_CRC32_ARCH=y
 CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32C_VPMSUM is not set
-CONFIG_CRYPTO_CURVE25519=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
@@ -82,17 +80,13 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_ENGINE=y
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
-CONFIG_CRYPTO_LIB_CURVE25519_INTERNAL=y
 CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
 CONFIG_CRYPTO_LIB_UTILS=y
-# CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RSA=y
-# CONFIG_CRYPTO_SHA1_PPC is not set
+CONFIG_CRYPTO_SIG=y
 CONFIG_CRYPTO_XTS=y
 CONFIG_DATA_SHIFT=12
 CONFIG_DEBUG_INFO=y
@@ -112,8 +106,11 @@ CONFIG_EDAC=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 # CONFIG_EDAC_CPC925 is not set
 # CONFIG_EDAC_DEBUG is not set
+# CONFIG_EDAC_ECS is not set
 CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_MEM_REPAIR is not set
 CONFIG_EDAC_MPC85XX=y
+# CONFIG_EDAC_SCRUB is not set
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EPAPR_PARAVIRT=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
@@ -175,6 +172,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 # CONFIG_GEN_RTC is not set
 # CONFIG_GIANFAR is not set
 CONFIG_GLOB=y
+CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MPC8XXX=y
@@ -222,8 +220,6 @@ CONFIG_MATH_EMULATION=y
 # CONFIG_MATH_EMULATION_FULL is not set
 CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
 CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
 CONFIG_MEMORY=y
 CONFIG_MIGRATION=y
 CONFIG_MMC=y
@@ -271,6 +267,7 @@ CONFIG_NR_CPUS=24
 CONFIG_NR_IRQS=512
 CONFIG_NVMEM=y
 CONFIG_NVMEM_LAYOUTS=y
+# CONFIG_NXP_ENETC4 is not set
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y
@@ -284,6 +281,7 @@ CONFIG_OLD_SIGSUSPEND=y
 CONFIG_OPTPROBES=y
 CONFIG_PACKING=y
 CONFIG_PADATA=y
+CONFIG_PAGE_BLOCK_MAX_ORDER=12
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_PAGE_POOL=y
 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
@@ -307,6 +305,7 @@ CONFIG_PPC=y
 CONFIG_PPC64=y
 CONFIG_PPC64_BIG_ENDIAN_ELF_ABI_V2=y
 CONFIG_PPC64_ELF_ABI_V2=y
+CONFIG_PPC64_PROC_SYSTEMCFG=y
 CONFIG_PPC_ADV_DEBUG_DACS=2
 CONFIG_PPC_ADV_DEBUG_DVCS=0
 CONFIG_PPC_ADV_DEBUG_IACS=2
@@ -358,6 +357,7 @@ CONFIG_RPS=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 CONFIG_SATA_FSL=y
 CONFIG_SATA_HOST=y
+CONFIG_SCHED_MC=y
 # CONFIG_SCOM_DEBUGFS is not set
 CONFIG_SCSI=y
 CONFIG_SCSI_COMMON=y
@@ -398,7 +398,6 @@ CONFIG_THERMAL_OF=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_THREAD_SHIFT=14
 # CONFIG_TOOLCHAIN_DEFAULT_CPU is not set
-CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 # CONFIG_UCLAMP_TASK is not set