diff --git a/config/kernel/linux-mvebu-current.config b/config/kernel/linux-mvebu-current.config index e64c77eb90..702d8ddfd5 100644 --- a/config/kernel/linux-mvebu-current.config +++ b/config/kernel/linux-mvebu-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.12 Kernel Configuration +# Linux/arm 5.10.37 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y @@ -1567,6 +1567,7 @@ CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y CONFIG_BPF_JIT=y +CONFIG_BPF_STREAM_PARSER=y CONFIG_NET_FLOW_LIMIT=y # @@ -2219,6 +2220,7 @@ CONFIG_MISC_ALCOR_PCI=m CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m CONFIG_HABANA_AI=m +CONFIG_UACCE=m # end of Misc devices CONFIG_HAVE_IDE=y @@ -3024,6 +3026,7 @@ CONFIG_WLAN_VENDOR_TI=y CONFIG_RTL8723DU=m CONFIG_RTL8723DS=m CONFIG_RTL8822BU=m +CONFIG_RTL8188EU=m CONFIG_RTL8821CU=m CONFIG_88XXAU=m # CONFIG_RTL8192EU is not set @@ -5323,6 +5326,13 @@ CONFIG_CHARLCD_BL_FLASH=y CONFIG_PANEL=m CONFIG_CHARLCD=m # CONFIG_UIO is not set +CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VFIO=m +# CONFIG_VFIO_NOIOMMU is not set +# CONFIG_VFIO_PCI is not set +# CONFIG_VFIO_PLATFORM is not set +CONFIG_VFIO_MDEV=m +CONFIG_VFIO_MDEV_DEVICE=m # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO=m CONFIG_VIRTIO_MENU=y @@ -5494,6 +5504,7 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y # end of Clock Source drivers # CONFIG_MAILBOX is not set +CONFIG_IOMMU_API=y # CONFIG_IOMMU_SUPPORT is not set # @@ -5657,7 +5668,6 @@ CONFIG_AD7887=m CONFIG_AD7923=m CONFIG_AD7949=m CONFIG_AD799X=m -# CONFIG_AD9467 is not set # CONFIG_ADI_AXI_ADC is not set CONFIG_CC10001_ADC=m CONFIG_ENVELOPE_DETECTOR=m @@ -6083,7 +6093,6 @@ CONFIG_ORION_IRQCHIP=y # CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PHY_MIPI_DPHY=y -CONFIG_USB_LGM_PHY=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set diff --git a/config/kernel/linux-rockchip64-current.config b/config/kernel/linux-rockchip64-current.config index 86daaa0278..12e9c673b0 100644 --- a/config/kernel/linux-rockchip64-current.config +++ b/config/kernel/linux-rockchip64-current.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.21 Kernel Configuration +# Linux/arm64 5.10.37 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 @@ -432,6 +432,7 @@ CONFIG_SETEND_EMULATION=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_VHE=y @@ -1908,7 +1909,6 @@ CONFIG_PCIEASPM_PERFORMANCE=y CONFIG_PCIE_PME=y # CONFIG_PCIE_DPC is not set # CONFIG_PCIE_PTM is not set -# CONFIG_PCIE_BW is not set CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_QUIRKS=y @@ -7445,7 +7445,6 @@ CONFIG_AD7887=m CONFIG_AD7923=m CONFIG_AD7949=m CONFIG_AD799X=m -# CONFIG_AD9467 is not set # CONFIG_ADI_AXI_ADC is not set CONFIG_AXP20X_ADC=m CONFIG_AXP288_ADC=m diff --git a/patch/kernel/archive/rockchip64-5.10/add-csgpio-to-rockchip-spi.patch b/patch/kernel/archive/rockchip64-5.10/add-csgpio-to-rockchip-spi.patch index b9278ddf00..b65a5b1e0f 100644 --- a/patch/kernel/archive/rockchip64-5.10/add-csgpio-to-rockchip-spi.patch +++ b/patch/kernel/archive/rockchip64-5.10/add-csgpio-to-rockchip-spi.patch @@ -69,7 +69,7 @@ index 2cc6d99..19e05ad 100644 + } +} + - static void rockchip_spi_config(struct rockchip_spi *rs, + static int rockchip_spi_config(struct rockchip_spi *rs, struct spi_device *spi, struct spi_transfer *xfer, bool use_dma) @@ -683,6 +732,8 @@ static int rockchip_spi_probe(struct platform_device *pdev)