From 6a48bc381b806c185678f8d30d1b85accc42aca6 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 14 Jan 2023 23:14:34 +0800 Subject: [PATCH] sunxi: refresh Kconfigs Signed-off-by: Tianling Shen --- target/linux/sunxi/config-5.15 | 10 ++++++++++ target/linux/sunxi/cortexa53/config-5.15 | 6 ++++++ target/linux/sunxi/cortexa7/config-5.15 | 5 ++++- target/linux/sunxi/cortexa8/config-5.15 | 4 +++- target/linux/sunxi/image/cortexa53.mk | 2 +- target/linux/sunxi/modules.mk | 5 ++--- 6 files changed, 26 insertions(+), 6 deletions(-) diff --git a/target/linux/sunxi/config-5.15 b/target/linux/sunxi/config-5.15 index c601c7cd2c..85018ba2ab 100644 --- a/target/linux/sunxi/config-5.15 +++ b/target/linux/sunxi/config-5.15 @@ -122,6 +122,12 @@ CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y +# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set +# CONFIG_DEVFREQ_GOV_POWERSAVE is not set +# CONFIG_DEVFREQ_GOV_USERSPACE is not set +# CONFIG_DEVFREQ_GOV_PASSIVE is not set +# CONFIG_DEVFREQ_THERMAL is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -233,6 +239,9 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set +# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y @@ -361,6 +370,7 @@ CONFIG_PINCTRL_SUN9I_A80_R=y CONFIG_PINCTRL_SUNXI=y CONFIG_PM=y CONFIG_PM_CLK=y +# CONFIG_PM_DEVFREQ_EVENT is not set CONFIG_PM_OPP=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y diff --git a/target/linux/sunxi/cortexa53/config-5.15 b/target/linux/sunxi/cortexa53/config-5.15 index cad9586d5c..d0e569ef11 100644 --- a/target/linux/sunxi/cortexa53/config-5.15 +++ b/target/linux/sunxi/cortexa53/config-5.15 @@ -21,6 +21,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 @@ -79,6 +84,7 @@ CONFIG_SUN50I_ERRATUM_UNKNOWN1=y # CONFIG_SUN50I_H616_CCU is not set CONFIG_SUN50I_H6_CCU=y CONFIG_SUN50I_H6_R_CCU=y +CONFIG_SUN50I_IOMMU=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_THREAD_INFO_IN_TASK=y CONFIG_UNMAP_KERNEL_AT_EL0=y diff --git a/target/linux/sunxi/cortexa7/config-5.15 b/target/linux/sunxi/cortexa7/config-5.15 index bddc010243..dc5e56d388 100644 --- a/target/linux/sunxi/cortexa7/config-5.15 +++ b/target/linux/sunxi/cortexa7/config-5.15 @@ -1,10 +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_DEVFREQ_THERMAL is not set 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 @@ -19,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-5.15 b/target/linux/sunxi/cortexa8/config-5.15 index 5b17bb23cd..f77eeca76a 100644 --- a/target/linux/sunxi/cortexa8/config-5.15 +++ b/target/linux/sunxi/cortexa8/config-5.15 @@ -1,7 +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_DEVFREQ_THERMAL is not set +# 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 @@ -11,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 diff --git a/target/linux/sunxi/image/cortexa53.mk b/target/linux/sunxi/image/cortexa53.mk index 006c9bbaa6..97e407eaf2 100644 --- a/target/linux/sunxi/image/cortexa53.mk +++ b/target/linux/sunxi/image/cortexa53.mk @@ -44,7 +44,7 @@ define Device/friendlyarm_nanopi-r1s-h5 DEVICE_VENDOR := FriendlyARM DEVICE_MODEL := Nanopi R1S H5 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-usb-net-rtl8152 \ - kmod-rtl8189es wpad-basic + kmod-rtl8189es wpad-basic-openssl SUPPORTED_DEVICES:=nanopi-r1s-h5 $(Device/sun50i-h5) endef diff --git a/target/linux/sunxi/modules.mk b/target/linux/sunxi/modules.mk index c717b26e74..f5d9aa6058 100644 --- a/target/linux/sunxi/modules.mk +++ b/target/linux/sunxi/modules.mk @@ -21,9 +21,8 @@ $(eval $(call KernelPackage,rtc-sunxi)) define KernelPackage/sunxi-ir SUBMENU:=$(OTHER_MENU) - TITLE:=Sunxi SoC built-in IR support (A20) - DEPENDS:=@TARGET_sunxi +kmod-multimedia-input - $(call AddDepends/rtc) + TITLE:=Sunxi SoC built-in IR support + DEPENDS:=@(TARGET_sunxi&&RTC_SUPPORT) +multimedia-input KCONFIG:= \ CONFIG_MEDIA_SUPPORT=y \ CONFIG_MEDIA_RC_SUPPORT=y \