diff --git a/config/kernel/linux-sunxi64-current.config b/config/kernel/linux-sunxi64-current.config index 09ca95f1a8..4e92b91a70 100644 --- a/config/kernel/linux-sunxi64-current.config +++ b/config/kernel/linux-sunxi64-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.24 Kernel Configuration +# Linux/arm64 5.15.34 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -396,7 +396,6 @@ CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_KEXEC is not set @@ -405,6 +404,7 @@ CONFIG_PARAVIRT=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y @@ -2091,7 +2091,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_DYNAMIC=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y -CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_OF_OVERLAY=y @@ -2744,11 +2743,6 @@ CONFIG_RTL8189FS=m CONFIG_RTL8189ES=m # CONFIG_WLAN_VENDOR_ZYDAS is not set CONFIG_WLAN_VENDOR_QUANTENNA=y -# CONFIG_MAC80211_HWSIM is not set -CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_VIRT_WIFI=m -# CONFIG_WAN is not set -CONFIG_IEEE802154_DRIVERS=m CONFIG_SPARD_WLAN_SUPPORT=y # @@ -2769,6 +2763,8 @@ CONFIG_TTY_OVERY_SDIO=m # CONFIG_MAC80211_HWSIM is not set CONFIG_USB_NET_RNDIS_WLAN=m CONFIG_VIRT_WIFI=m +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m # # Wireless WAN @@ -3130,6 +3126,9 @@ CONFIG_SERIAL_DEV_CTRL_TTYPORT=y CONFIG_VIRTIO_CONSOLE=y # CONFIG_IPMI_HANDLER is not set # CONFIG_IPMB_DEVICE_INTERFACE is not set +CONFIG_SUNXI_SYS_INFO=y +CONFIG_DUMP_REG=m +CONFIG_DUMP_REG_MISC=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_BA431=m @@ -3824,7 +3823,7 @@ CONFIG_MFD_SUN4I_GPADC=y # CONFIG_MFD_BCM590XX is not set CONFIG_MFD_BD9571MWV=m CONFIG_MFD_AC100=y -CONFIG_MFD_AC200=m +CONFIG_MFD_AC200=y CONFIG_MFD_AXP20X=y CONFIG_MFD_AXP20X_I2C=y CONFIG_MFD_AXP20X_RSB=y @@ -5168,11 +5167,11 @@ CONFIG_SND_SOC_NAU8315=m CONFIG_SND_SOC_NAU8822=m # CONFIG_SND_SOC_NAU8824 is not set # CONFIG_SND_SOC_TPA6130A2 is not set -CONFIG_SND_SOC_ACX00=y CONFIG_SND_SOC_LPASS_WSA_MACRO=m CONFIG_SND_SOC_LPASS_VA_MACRO=m CONFIG_SND_SOC_LPASS_RX_MACRO=m CONFIG_SND_SOC_LPASS_TX_MACRO=m +CONFIG_SND_SOC_ACX00=y # end of CODEC drivers CONFIG_SND_SIMPLE_CARD_UTILS=m diff --git a/patch/kernel/archive/sunxi-5.10/0001-mfd-Add-support-for-AC200.patch b/patch/kernel/archive/sunxi-5.10/0001-mfd-Add-support-for-AC200.patch index f74e3c209c..52aa335e0e 100644 --- a/patch/kernel/archive/sunxi-5.10/0001-mfd-Add-support-for-AC200.patch +++ b/patch/kernel/archive/sunxi-5.10/0001-mfd-Add-support-for-AC200.patch @@ -22,7 +22,7 @@ index 420900852166..a45e7c88ac9b 100644 components like codecs or RTC under the corresponding menus. +config MFD_AC200 -+ tristate "X-Powers AC200" ++ bool "X-Powers AC200" + select MFD_CORE + depends on I2C + help diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-mfd-Add-support-for-AC200.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-mfd-Add-support-for-AC200.patch index 520c5be3c3..0a79ef9e91 100644 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-mfd-Add-support-for-AC200.patch +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-mfd-Add-support-for-AC200.patch @@ -22,7 +22,7 @@ index d2f345245..5b756e81b 100644 components like codecs or RTC under the corresponding menus. +config MFD_AC200 -+ tristate "X-Powers AC200" ++ bool "X-Powers AC200" + select MFD_CORE + depends on I2C + help diff --git a/patch/kernel/archive/sunxi-5.16/patches.armbian/drv-mfd-Add-support-for-AC200.patch b/patch/kernel/archive/sunxi-5.16/patches.armbian/drv-mfd-Add-support-for-AC200.patch index 520c5be3c3..0a79ef9e91 100644 --- a/patch/kernel/archive/sunxi-5.16/patches.armbian/drv-mfd-Add-support-for-AC200.patch +++ b/patch/kernel/archive/sunxi-5.16/patches.armbian/drv-mfd-Add-support-for-AC200.patch @@ -22,7 +22,7 @@ index d2f345245..5b756e81b 100644 components like codecs or RTC under the corresponding menus. +config MFD_AC200 -+ tristate "X-Powers AC200" ++ bool "X-Powers AC200" + select MFD_CORE + depends on I2C + help diff --git a/patch/kernel/archive/sunxi-5.17/patches.armbian/drv-mfd-Add-support-for-AC200.patch b/patch/kernel/archive/sunxi-5.17/patches.armbian/drv-mfd-Add-support-for-AC200.patch index 520c5be3c3..0a79ef9e91 100644 --- a/patch/kernel/archive/sunxi-5.17/patches.armbian/drv-mfd-Add-support-for-AC200.patch +++ b/patch/kernel/archive/sunxi-5.17/patches.armbian/drv-mfd-Add-support-for-AC200.patch @@ -22,7 +22,7 @@ index d2f345245..5b756e81b 100644 components like codecs or RTC under the corresponding menus. +config MFD_AC200 -+ tristate "X-Powers AC200" ++ bool "X-Powers AC200" + select MFD_CORE + depends on I2C + help