[DistroKit] [PATCH 6/8] v7a: kernel: update 6.11 -> v6.13-rc2

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

The config changes differ from the default in disabling
CONFIG_IMX_SCMI_BBM_EXT and CONFIG_IMX_SCMI_MISC_EXT.

Both options are not applicable to any 32-bit i.MX targets.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/kernelconfig   | 81 ++++++++++++++++++++---------
 configs/platform-v7a/platformconfig |  4 +-
 2 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig
index 66ecdc7b1cce..56e62f97f1e9 100644
--- a/configs/platform-v7a/kernelconfig
+++ b/configs/platform-v7a/kernelconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.11 Kernel Configuration
+# Linux/arm 6.13-rc2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-v7a-linux-gnueabihf-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118"
 CONFIG_CC_IS_GCC=y
@@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24000
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24000
 CONFIG_LLD_VERSION=0
+CONFIG_RUSTC_VERSION=107000
+CONFIG_RUSTC_LLVM_VERSION=160002
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y
@@ -167,6 +169,7 @@ CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
@@ -175,6 +178,7 @@ CONFIG_SCHED_MM_CID=y
 # CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
@@ -588,6 +592,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 # CONFIG_ARM_APPENDED_DTB is not set
 CONFIG_CMDLINE=""
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_ARCH_DEFAULT_CRASH_DUMP=y
 CONFIG_AUTO_ZRELADDR=y
 # CONFIG_EFI is not set
 # end of Boot options
@@ -620,6 +625,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=y
+# CONFIG_CPUFREQ_VIRT is not set
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=y
 CONFIG_ARM_IMX6Q_CPUFREQ=y
@@ -683,6 +689,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 
 CONFIG_AS_VFP_VMRS_FPINST=y
 CONFIG_CPU_MITIGATIONS=y
+CONFIG_ARCH_HAS_DMA_OPS=y
 
 #
 # General architecture-dependent options
@@ -784,10 +791,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS_NONE=y
-# CONFIG_MODULE_COMPRESS_GZIP is not set
-# CONFIG_MODULE_COMPRESS_XZ is not set
-# CONFIG_MODULE_COMPRESS_ZSTD is not set
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_TRIM_UNUSED_KSYMS=y
@@ -857,7 +861,6 @@ CONFIG_COREDUMP=y
 # Memory Management options
 #
 # CONFIG_SWAP is not set
-CONFIG_HAVE_ZSMALLOC=y
 
 #
 # Slab allocator options
@@ -882,7 +885,7 @@ CONFIG_FLATMEM=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SPLIT_PTE_PTLOCKS=y
 CONFIG_COMPACTION=y
 CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_PAGE_REPORTING is not set
@@ -929,6 +932,7 @@ CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_XGRESS=y
 CONFIG_SKB_EXTENSIONS=y
+CONFIG_NET_DEVMEM=y
 
 #
 # Networking options
@@ -1025,6 +1029,7 @@ CONFIG_NETFILTER_BPF_LINK=y
 #
 # IP: Netfilter Configuration
 #
+# CONFIG_IP_NF_IPTABLES_LEGACY is not set
 # CONFIG_NF_SOCKET_IPV4 is not set
 # CONFIG_NF_TPROXY_IPV4 is not set
 # CONFIG_NF_DUP_IPV4 is not set
@@ -1037,6 +1042,7 @@ CONFIG_NETFILTER_BPF_LINK=y
 #
 # IPv6: Netfilter Configuration
 #
+# CONFIG_IP6_NF_IPTABLES_LEGACY is not set
 # CONFIG_NF_SOCKET_IPV6 is not set
 # CONFIG_NF_TPROXY_IPV6 is not set
 # CONFIG_NF_DUP_IPV6 is not set
@@ -1211,6 +1217,7 @@ CONFIG_WANT_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
@@ -1256,14 +1263,28 @@ CONFIG_VEXPRESS_CONFIG=y
 #
 CONFIG_ARM_SCMI_PROTOCOL=y
 # CONFIG_ARM_SCMI_RAW_MODE_SUPPORT is not set
+# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set
+
+#
+# SCMI Transport Drivers
+#
 CONFIG_ARM_SCMI_HAVE_TRANSPORT=y
 CONFIG_ARM_SCMI_HAVE_SHMEM=y
 CONFIG_ARM_SCMI_HAVE_MSG=y
 CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y
-CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
+CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
+# end of SCMI Transport Drivers
+
+#
+# ARM SCMI NXP i.MX Vendor Protocols
+#
+# CONFIG_IMX_SCMI_BBM_EXT is not set
+# CONFIG_IMX_SCMI_MISC_EXT is not set
+# end of ARM SCMI NXP i.MX Vendor Protocols
+
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol
 
@@ -1471,6 +1492,7 @@ CONFIG_BLK_DEV_NBD=y
 #
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
+# CONFIG_RPMB is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ATMEL_SSC is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
@@ -1504,12 +1526,6 @@ CONFIG_EEPROM_93CX6=y
 # CONFIG_EEPROM_EE1004 is not set
 # end of EEPROM support
 
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_TI_ST is not set
-# end of Texas Instruments shared transport line discipline
-
 # CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 # CONFIG_ALTERA_STAPL is not set
@@ -1615,6 +1631,7 @@ CONFIG_FEC=y
 # CONFIG_GIANFAR is not set
 # CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_ENETC_IERB is not set
+# CONFIG_NXP_NETC_BLK_CTRL is not set
 # CONFIG_NET_VENDOR_FUNGIBLE is not set
 CONFIG_NET_VENDOR_GOOGLE=y
 # CONFIG_NET_VENDOR_HISILICON is not set
@@ -1633,6 +1650,7 @@ CONFIG_NET_VENDOR_MICROSOFT=y
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_ETHOC is not set
+# CONFIG_OA_TC6 is not set
 # CONFIG_NET_VENDOR_PENSANDO is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
@@ -1967,7 +1985,6 @@ CONFIG_DEVPORT=y
 #
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
-# CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y
@@ -1985,7 +2002,7 @@ CONFIG_I2C_AT91=y
 CONFIG_I2C_BCM2835=y
 CONFIG_I2C_BRCMSTB=y
 # CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
+# CONFIG_I2C_DESIGNWARE_CORE is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_IMX=y
@@ -2137,10 +2154,8 @@ CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SX=y
 # CONFIG_PINCTRL_IMX8ULP is not set
-# CONFIG_PINCTRL_IMXRT1050 is not set
 # CONFIG_PINCTRL_IMX91 is not set
 # CONFIG_PINCTRL_IMX93 is not set
-# CONFIG_PINCTRL_IMXRT1170 is not set
 
 #
 # Renesas pinctrl drivers
@@ -2179,6 +2194,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_POLARFIRE_SOC is not set
 CONFIG_GPIO_SAMA5D2_PIOBU=y
 # CONFIG_GPIO_SIFIVE is not set
 CONFIG_GPIO_SYSCON=y
@@ -2229,6 +2245,7 @@ CONFIG_GPIO_TWL4030=y
 #
 # USB GPIO expanders
 #
+# CONFIG_GPIO_MPSSE is not set
 # end of USB GPIO expanders
 
 #
@@ -2316,6 +2333,7 @@ CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_DEBUGFS=y
+# CONFIG_THERMAL_CORE_TESTING is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_OF=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@@ -2405,6 +2423,7 @@ CONFIG_BCMA_POSSIBLE=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_ADP5585 is not set
 # CONFIG_MFD_ACT8945A is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_SMPRO is not set
@@ -2682,6 +2701,7 @@ CONFIG_HID=y
 # CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_GLORIOUS is not set
+# CONFIG_HID_GOODIX_SPI is not set
 # CONFIG_HID_GOOGLE_STADIA_FF is not set
 # CONFIG_HID_VIVALDI is not set
 # CONFIG_HID_KEYTOUCH is not set
@@ -3104,6 +3124,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV3032 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD2405AL is not set
 # CONFIG_RTC_DRV_SD3078 is not set
 
 #
@@ -3200,6 +3221,7 @@ CONFIG_IMX_SDMA=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_XDMA is not set
 # CONFIG_XILINX_ZYNQMP_DPDMA is not set
+# CONFIG_AMD_QDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_DW_DMAC is not set
@@ -3342,7 +3364,6 @@ CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_MAILBOX=y
 # CONFIG_ARM_MHU is not set
 # CONFIG_ARM_MHU_V2 is not set
-# CONFIG_ARM_MHU_V3 is not set
 CONFIG_IMX_MBOX=y
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PL320_MBOX is not set
@@ -3371,8 +3392,6 @@ CONFIG_STM32_RPROC=y
 # CONFIG_RPMSG_VIRTIO is not set
 # end of Rpmsg drivers
 
-# CONFIG_SOUNDWIRE is not set
-
 #
 # SOC (System On Chip) specific Drivers
 #
@@ -3488,6 +3507,7 @@ CONFIG_EXTCON=y
 #
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_LC824206XA is not set
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_PALMAS is not set
 # CONFIG_EXTCON_PTN5150 is not set
@@ -3561,6 +3581,7 @@ CONFIG_RESET_SIMPLE=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_PHY_CAN_TRANSCEIVER=y
+# CONFIG_PHY_NXP_PTN3222 is not set
 
 #
 # PHY drivers for Broadcom platforms
@@ -3581,6 +3602,7 @@ CONFIG_PHY_CAN_TRANSCEIVER=y
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
+# CONFIG_PHY_STM32_COMBOPHY is not set
 CONFIG_PHY_STM32_USBPHYC=y
 # CONFIG_PHY_DM816X_USB is not set
 # CONFIG_OMAP_CONTROL_PHY is not set
@@ -3623,6 +3645,7 @@ CONFIG_NVMEM_LAYOUTS=y
 #
 # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set
 # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set
+# CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set
 # end of Layout Types
 
 CONFIG_NVMEM_IMX_IIM=y
@@ -3690,7 +3713,6 @@ CONFIG_EXT4_FS=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_GFS2_FS is not set
@@ -3709,6 +3731,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
+# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 # CONFIG_QUOTA is not set
 CONFIG_AUTOFS_FS=y
 # CONFIG_FUSE_FS is not set
@@ -3906,6 +3929,9 @@ CONFIG_KEYS=y
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_KEY_DH_OPERATIONS is not set
 CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_PROC_MEM_ALWAYS_FORCE=y
+# CONFIG_PROC_MEM_FORCE_PTRACE is not set
+# CONFIG_PROC_MEM_NO_FORCE is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 CONFIG_HARDENED_USERCOPY=y
@@ -3956,6 +3982,7 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_SIG=y
 CONFIG_CRYPTO_SIG2=y
 CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y
@@ -4225,7 +4252,9 @@ CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_POWERPC is not set
 CONFIG_XZ_DEC_ARM=y
 # CONFIG_XZ_DEC_ARMTHUMB is not set
+CONFIG_XZ_DEC_ARM64=y
 # CONFIG_XZ_DEC_SPARC is not set
+CONFIG_XZ_DEC_RISCV=y
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
@@ -4235,7 +4264,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
-CONFIG_DMA_OPS=y
+CONFIG_DMA_OPS_HELPERS=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_DMA_DECLARE_COHERENT=y
 CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
@@ -4282,6 +4311,7 @@ CONFIG_SBITMAP=y
 # end of Library routines
 
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_UNION_FIND=y
 
 #
 # Kernel hacking
@@ -4320,7 +4350,6 @@ CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
 # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
-# CONFIG_DEBUG_INFO_BTF is not set
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -4356,6 +4385,7 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 # CONFIG_NET_DEV_REFCNT_TRACKER is not set
 # CONFIG_NET_NS_REFCNT_TRACKER is not set
 # CONFIG_DEBUG_NET is not set
+# CONFIG_DEBUG_NET_SMALL_RTNL is not set
 # end of Networking Debugging
 
 #
@@ -4426,7 +4456,6 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
-# CONFIG_DEBUG_TIMEKEEPING is not set
 CONFIG_DEBUG_PREEMPT=y
 
 #
@@ -4566,6 +4595,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_MIN_HEAP is not set
 # CONFIG_TEST_DIV64 is not set
+# CONFIG_TEST_MULDIV64 is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_TEST_REF_TRACKER is not set
 # CONFIG_RBTREE_TEST is not set
@@ -4595,6 +4625,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_DYNAMIC_DEBUG is not set
 # CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_KALLSYMS is not set
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 3798c823dd6b..789cc8978459 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -124,8 +124,8 @@ PTXCONF_KERNEL_INSTALL=y
 PTXCONF_KERNEL_MODULES=y
 PTXCONF_KERNEL_MODULES_INSTALL=y
 # PTXCONF_KERNEL_MODULES_SIGN is not set
-PTXCONF_KERNEL_VERSION="6.11"
-PTXCONF_KERNEL_MD5="612a9feef07be8663098a0a58cddf7a6"
+PTXCONF_KERNEL_VERSION="6.13-rc2"
+PTXCONF_KERNEL_MD5="c4e71cd555ce35c45fccbe4b6a266427"
 # PTXCONF_KERNEL_IMAGE_BZ is not set
 PTXCONF_KERNEL_IMAGE_Z=y
 # PTXCONF_KERNEL_IMAGE_XIP is not set
-- 
2.39.5