From b40a047f1fefa086826b3c65fa1ed34cc8a4a3ed Mon Sep 17 00:00:00 2001 From: Chukun Pan Date: Fri, 2 Sep 2022 23:18:10 +0800 Subject: [PATCH] sunxi: fix sunxi-ir kconfig and description Removed a20 in description, since it only works for a10, a13 and a31. Also refreshed kernel config. Fixes: #10466 Signed-off-by: Chukun Pan (moved fixes, refreshed, added CONFIG_DVB_USB=n) Signed-off-by: Christian Lamparter --- target/linux/generic/config-5.10 | 6 ++++++ target/linux/generic/config-5.15 | 6 ++++++ target/linux/sunxi/modules.mk | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 722b7578f8de..ebf30fdc26ef 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -1721,6 +1721,7 @@ CONFIG_DVB_MAX_ADAPTERS=16 # CONFIG_DVB_TUNER_DIB0090 is not set # CONFIG_DVB_TUNER_ITD1000 is not set # CONFIG_DVB_ULE_DEBUG is not set +# CONFIG_DVB_USB is not set # CONFIG_DVB_USB_V2 is not set # CONFIG_DVB_VES1820 is not set # CONFIG_DVB_VES1X93 is not set @@ -2793,8 +2794,11 @@ CONFIG_IP_VS_MH_TAB_INDEX=10 # CONFIG_IR_RC5_DECODER is not set # CONFIG_IR_RC6_DECODER is not set # CONFIG_IR_REDRAT3 is not set +# CONFIG_IR_SERIAL is not set +# CONFIG_IR_SIR is not set # CONFIG_IR_SONY_DECODER is not set # CONFIG_IR_STREAMZAP is not set +# CONFIG_IR_TOY is not set # CONFIG_IR_TTUSBIR is not set # CONFIG_ISA_BUS is not set # CONFIG_ISA_BUS_API is not set @@ -3060,6 +3064,7 @@ CONFIG_LIB_MEMNEQ=y CONFIG_LINEAR_RANGES=y # CONFIG_LIQUIDIO is not set # CONFIG_LIQUIDIO_VF is not set +# CONFIG_LIRC is not set # CONFIG_LIS3L02DQ is not set # CONFIG_LKDTM is not set CONFIG_LLC=y @@ -4716,6 +4721,7 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3 # CONFIG_RC_DECODERS is not set # CONFIG_RC_LOOPBACK is not set # CONFIG_RC_MAP is not set +# CONFIG_RC_XBOX_DVD is not set # CONFIG_RDS is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_GZIP is not set diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15 index 52aba2fa0e63..304d99c19cff 100644 --- a/target/linux/generic/config-5.15 +++ b/target/linux/generic/config-5.15 @@ -1797,6 +1797,7 @@ CONFIG_DVB_MAX_ADAPTERS=16 # CONFIG_DVB_TUNER_DIB0090 is not set # CONFIG_DVB_TUNER_ITD1000 is not set # CONFIG_DVB_ULE_DEBUG is not set +# CONFIG_DVB_USB is not set # CONFIG_DVB_USB_V2 is not set # CONFIG_DVB_VES1820 is not set # CONFIG_DVB_VES1X93 is not set @@ -2903,8 +2904,11 @@ CONFIG_IP_VS_MH_TAB_INDEX=10 # CONFIG_IR_RC5_DECODER is not set # CONFIG_IR_RC6_DECODER is not set # CONFIG_IR_REDRAT3 is not set +# CONFIG_IR_SERIAL is not set +# CONFIG_IR_SIR is not set # CONFIG_IR_SONY_DECODER is not set # CONFIG_IR_STREAMZAP is not set +# CONFIG_IR_TOY is not set # CONFIG_IR_TTUSBIR is not set # CONFIG_ISA_BUS is not set # CONFIG_ISA_BUS_API is not set @@ -3173,6 +3177,7 @@ CONFIG_LIB_MEMNEQ=y CONFIG_LINEAR_RANGES=y # CONFIG_LIQUIDIO is not set # CONFIG_LIQUIDIO_VF is not set +# CONFIG_LIRC is not set # CONFIG_LIS3L02DQ is not set # CONFIG_LITEX_LITEETH is not set # CONFIG_LITEX_SOC_CONTROLLER is not set @@ -4945,6 +4950,7 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3 # CONFIG_RC_DECODERS is not set # CONFIG_RC_LOOPBACK is not set # CONFIG_RC_MAP is not set +# CONFIG_RC_XBOX_DVD is not set # CONFIG_RDS is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_GZIP is not set diff --git a/target/linux/sunxi/modules.mk b/target/linux/sunxi/modules.mk index 0c8ed83d0d89..8bbafe98a7b1 100644 --- a/target/linux/sunxi/modules.mk +++ b/target/linux/sunxi/modules.mk @@ -21,19 +21,20 @@ $(eval $(call KernelPackage,rtc-sunxi)) define KernelPackage/sunxi-ir SUBMENU:=$(OTHER_MENU) - TITLE:=Sunxi SoC built-in IR support (A20) + TITLE:=Sunxi SoC built-in IR support DEPENDS:=@(TARGET_sunxi&&RTC_SUPPORT) +kmod-input-core KCONFIG:= \ CONFIG_MEDIA_SUPPORT=y \ CONFIG_MEDIA_RC_SUPPORT=y \ CONFIG_RC_DEVICES=y \ + CONFIG_RC_CORE=y \ CONFIG_IR_SUNXI FILES:=$(LINUX_DIR)/drivers/media/rc/sunxi-cir.ko AUTOLOAD:=$(call AutoLoad,50,sunxi-cir) endef define KernelPackage/sunxi-ir/description - Support for the AllWinner sunXi SoC's onboard IR (A20) + Support for the AllWinner sunXi SoC's onboard IR endef $(eval $(call KernelPackage,sunxi-ir)) -- 2.30.2