diff --git a/target/linux/sunxi/config-6.1 b/target/linux/sunxi/config-6.1 index d8d4450e9e..63d2cfeb81 100644 --- a/target/linux/sunxi/config-6.1 +++ b/target/linux/sunxi/config-6.1 @@ -495,7 +495,6 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TOUCHSCREEN_SUN4I=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -# CONFIG_UACCE is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y CONFIG_USB=y diff --git a/target/linux/sunxi/cortexa53/config-6.1 b/target/linux/sunxi/cortexa53/config-6.1 index f57c664540..108ab35c32 100644 --- a/target/linux/sunxi/cortexa53/config-6.1 +++ b/target/linux/sunxi/cortexa53/config-6.1 @@ -26,6 +26,11 @@ CONFIG_ARM_AMBA=y CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y +CONFIG_ARM_SMMU=y +CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y +# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set +CONFIG_ARM_SMMU_V3=y +# CONFIG_ARM_SMMU_V3_SVA is not set CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y CONFIG_CPU_LITTLE_ENDIAN=y @@ -88,9 +93,11 @@ CONFIG_SUN50I_ERRATUM_UNKNOWN1=y CONFIG_SUN50I_H616_CCU=y CONFIG_SUN50I_H6_CCU=y CONFIG_SUN50I_H6_R_CCU=y +CONFIG_SUN50I_IOMMU=y # CONFIG_SUN6I_RTC_CCU is not set CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_THREAD_INFO_IN_TASK=y +# CONFIG_UACCE is not set CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_USB_MUSB_DUAL_ROLE=y CONFIG_USB_MUSB_HDRC=y diff --git a/target/linux/sunxi/cortexa7/config-6.1 b/target/linux/sunxi/cortexa7/config-6.1 index e911da4c3d..dc5e56d388 100644 --- a/target/linux/sunxi/cortexa7/config-6.1 +++ b/target/linux/sunxi/cortexa7/config-6.1 @@ -1,9 +1,12 @@ +# CONFIG_ARM_LPAE is not set +# CONFIG_ARM_SMMU is not set CONFIG_B53=y CONFIG_B53_MDIO_DRIVER=y CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y CONFIG_DWMAC_SUN8I=y CONFIG_GRO_CELLS=y +# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set # CONFIG_MACH_SUN4I is not set # CONFIG_MACH_SUN5I is not set CONFIG_MDIO_BUS_MUX=y @@ -18,6 +21,7 @@ CONFIG_NET_DSA_TAG_BRCM_PREPEND=y CONFIG_NET_SWITCHDEV=y CONFIG_NOP_USB_XCEIV=y CONFIG_RTC_DRV_SUN6I=y +# CONFIG_SUN50I_IOMMU is not set CONFIG_USB_MUSB_DUAL_ROLE=y CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_SUNXI=y diff --git a/target/linux/sunxi/cortexa8/config-6.1 b/target/linux/sunxi/cortexa8/config-6.1 index b893b3142e..f77eeca76a 100644 --- a/target/linux/sunxi/cortexa8/config-6.1 +++ b/target/linux/sunxi/cortexa8/config-6.1 @@ -1,6 +1,8 @@ # CONFIG_ARM_LPAE is not set +# CONFIG_ARM_SMMU is not set CONFIG_CRYPTO_BLAKE2S_ARM=y CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set # CONFIG_MACH_SUN6I is not set # CONFIG_MACH_SUN7I is not set # CONFIG_MACH_SUN8I is not set @@ -10,3 +12,4 @@ CONFIG_PGTABLE_LEVELS=2 # CONFIG_SPI_SUN6I is not set # CONFIG_SUN8I_A83T_CCU is not set # CONFIG_SUN8I_THERMAL is not set +# CONFIG_SUN50I_IOMMU is not set