From 882203880a67382095788cf4a73107dcce7ab266 Mon Sep 17 00:00:00 2001 From: suyuan168 <175338101@qq.com> Date: Mon, 3 Jan 2022 20:13:47 +0800 Subject: [PATCH] fix modus --- root/include/netfilter.mk | 2 +- root/package/kernel/linux/modules/crypto.mk | 40 ++++++--- root/package/kernel/linux/modules/fs.mk | 50 ++++++++--- root/package/kernel/linux/modules/input.mk | 6 +- .../package/kernel/linux/modules/netfilter.mk | 10 ++- root/package/kernel/linux/modules/other.mk | 88 ++++++++++++++----- root/package/kernel/linux/modules/sound.mk | 10 +-- 7 files changed, 148 insertions(+), 58 deletions(-) diff --git a/root/include/netfilter.mk b/root/include/netfilter.mk index d5b22aec..044a9719 100755 --- a/root/include/netfilter.mk +++ b/root/include/netfilter.mk @@ -384,4 +384,4 @@ IPT_BUILTIN += $(EBTABLES_IP4-y) IPT_BUILTIN += $(EBTABLES_IP6-y) IPT_BUILTIN += $(EBTABLES_WATCHERS-y) -endif # __inc_netfilter \ No newline at end of file +endif # __inc_netfilter diff --git a/root/package/kernel/linux/modules/crypto.mk b/root/package/kernel/linux/modules/crypto.mk index 7ee603d5..38d3d457 100755 --- a/root/package/kernel/linux/modules/crypto.mk +++ b/root/package/kernel/linux/modules/crypto.mk @@ -287,7 +287,7 @@ define KernelPackage/crypto-ghash/arm-ce AUTOLOAD+=$(call AutoLoad,09,ghash-arm-ce) endef -KernelPackage/crypto-ghash/imx6=$(KernelPackage/crypto-ghash/arm-ce) +KernelPackage/crypto-ghash/imx=$(KernelPackage/crypto-ghash/arm-ce) KernelPackage/crypto-ghash/ipq40xx=$(KernelPackage/crypto-ghash/arm-ce) KernelPackage/crypto-ghash/mvebu/cortexa9=$(KernelPackage/crypto-ghash/arm-ce) @@ -447,13 +447,23 @@ endef $(eval $(call KernelPackage,crypto-kpp)) +define KernelPackage/crypto-lib-blake2s-generic + TITLE:=BLAKE2s hash function library generic + DEPENDS:=@(!CONFIG_arm&&!TARGET_x86) + KCONFIG:=CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC + HIDDEN:=1 + FILES:= $(LINUX_DIR)/lib/crypto/libblake2s-generic.ko + $(call AddDepends/crypto,+PACKAGE_kmod-crypto-hash:kmod-crypto-hash) +endef + +$(eval $(call KernelPackage,crypto-lib-blake2s-generic)) + define KernelPackage/crypto-lib-blake2s TITLE:=BLAKE2s hash function library + DEPENDS:=+kmod-crypto-lib-blake2s-generic KCONFIG:=CONFIG_CRYPTO_LIB_BLAKE2S HIDDEN:=1 - FILES:= \ - $(LINUX_DIR)/lib/crypto/libblake2s.ko@lt5.14 \ - $(LINUX_DIR)/lib/crypto/libblake2s-generic.ko@lt5.14 + FILES:= $(LINUX_DIR)/lib/crypto/libblake2s.ko $(call AddDepends/crypto,+PACKAGE_kmod-crypto-hash:kmod-crypto-hash) endef @@ -466,6 +476,16 @@ define KernelPackage/crypto-lib-blake2s/x86/64 FILES+=$(LINUX_DIR)/arch/x86/crypto/blake2s-x86_64.ko endef +define KernelPackage/crypto-lib-blake2s/arm + KCONFIG+=CONFIG_CRYPTO_BLAKE2S_ARM + FILES+=$(LINUX_DIR)/arch/arm/crypto/blake2s-arm.ko +endef + +ifdef KernelPackage/crypto-lib-blake2s/$(ARCH) + KernelPackage/crypto-lib-blake2s/$(CRYPTO_TARGET)=\ + $(KernelPackage/crypto-lib-blake2s/$(ARCH)) +endif + $(eval $(call KernelPackage,crypto-lib-blake2s)) @@ -683,7 +703,7 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_KHAZAD \ CONFIG_CRYPTO_SERPENT \ CONFIG_CRYPTO_TEA \ - CONFIG_CRYPTO_TGR192 \ + CONFIG_CRYPTO_TGR192@lt5.12 \ CONFIG_CRYPTO_TWOFISH \ CONFIG_CRYPTO_TWOFISH_COMMON \ CONFIG_CRYPTO_TWOFISH_586 \ @@ -696,7 +716,7 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/cast6_generic.ko \ $(LINUX_DIR)/crypto/khazad.ko \ $(LINUX_DIR)/crypto/tea.ko \ - $(LINUX_DIR)/crypto/tgr192.ko@lt5.14 \ + $(LINUX_DIR)/crypto/tgr192.ko@lt5.12 \ $(LINUX_DIR)/crypto/twofish_common.ko \ $(LINUX_DIR)/crypto/wp512.ko \ $(LINUX_DIR)/crypto/twofish_generic.ko \ @@ -704,7 +724,7 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/blowfish_generic.ko \ $(LINUX_DIR)/crypto/serpent_generic.ko AUTOLOAD:=$(call AutoLoad,10,anubis camellia_generic cast_common \ - cast5_generic cast6_generic khazad tea tgr192 twofish_common \ + cast5_generic cast6_generic khazad tea tgr192@lt5.12 twofish_common \ wp512 blowfish_common serpent_generic) ifndef CONFIG_TARGET_x86 AUTOLOAD+= $(call AutoLoad,10,twofish_generic blowfish_generic) @@ -717,7 +737,7 @@ ifndef CONFIG_TARGET_x86_64 FILES+= \ $(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \ $(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \ - $(LINUX_DIR)/arch/x86/crypto/glue_helper.ko@lt5.14 \ + $(LINUX_DIR)/arch/x86/crypto/glue_helper.ko \ $(LINUX_DIR)/crypto/cryptd.ko \ $(LINUX_DIR)/crypto/crypto_simd.ko AUTOLOAD+= $(call AutoLoad,10,cryptd glue_helper \ @@ -857,7 +877,7 @@ define KernelPackage/crypto-sha1/arm-neon AUTOLOAD+=$(call AutoLoad,09,sha1-arm-neon) endef -KernelPackage/crypto-sha1/imx6=$(KernelPackage/crypto-sha1/arm-neon) +KernelPackage/crypto-sha1/imx=$(KernelPackage/crypto-sha1/arm-neon) KernelPackage/crypto-sha1/ipq40xx=$(KernelPackage/crypto-sha1/arm-neon) KernelPackage/crypto-sha1/mvebu/cortexa9=$(KernelPackage/crypto-sha1/arm-neon) @@ -921,7 +941,7 @@ define KernelPackage/crypto-sha512/arm AUTOLOAD+=$(call AutoLoad,09,sha512-arm) endef -KernelPackage/crypto-sha512/imx6=$(KernelPackage/crypto-sha512/arm) +KernelPackage/crypto-sha512/imx=$(KernelPackage/crypto-sha512/arm) KernelPackage/crypto-sha512/ipq40xx=$(KernelPackage/crypto-sha512/arm) KernelPackage/crypto-sha512/mvebu/cortexa9=$(KernelPackage/crypto-sha512/arm) diff --git a/root/package/kernel/linux/modules/fs.mk b/root/package/kernel/linux/modules/fs.mk index 8c5c787d..e74bcf84 100755 --- a/root/package/kernel/linux/modules/fs.mk +++ b/root/package/kernel/linux/modules/fs.mk @@ -70,7 +70,6 @@ define KernelPackage/fs-btrfs DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd KCONFIG:=\ CONFIG_BTRFS_FS \ - CONFIG_BTRFS_FS_POSIX_ACL=n \ CONFIG_BTRFS_FS_CHECK_INTEGRITY=n FILES:=\ $(LINUX_DIR)/fs/btrfs/btrfs.ko @@ -88,24 +87,30 @@ define KernelPackage/fs-cifs SUBMENU:=$(FS_MENU) TITLE:=CIFS support KCONFIG:= \ + CONFIG_SMBFS_COMMON@ge5.15 \ CONFIG_CIFS \ CONFIG_CIFS_DFS_UPCALL=n \ CONFIG_CIFS_UPCALL=n - FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko + FILES:= \ + $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@ge5.15 \ + $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@ge5.15 \ + $(LINUX_DIR)/fs/cifs/cifs.ko AUTOLOAD:=$(call AutoLoad,30,cifs) $(call AddDepends/nls) DEPENDS+= \ - +kmod-crypto-md4 \ + +(LINUX_5_4||LINUX_5_10):kmod-crypto-md4\ + +(LINUX_5_4||LINUX_5_10):kmod-crypto-arc4 \ +kmod-crypto-md5 \ +kmod-crypto-sha256 \ +kmod-crypto-sha512 \ +kmod-crypto-cmac \ +kmod-crypto-hmac \ - +kmod-crypto-arc4 \ +kmod-crypto-aead \ +kmod-crypto-ccm \ +kmod-crypto-ecb \ - +kmod-crypto-des + +(LINUX_5_15):kmod-asn1-decoder \ + +(LINUX_5_15):kmod-oid-registry \ + +(LINUX_5_15):kmod-dnsresolver endef define KernelPackage/fs-cifs/description @@ -240,10 +245,21 @@ endef $(eval $(call KernelPackage,fs-f2fs)) +define KernelPackage/fs-netfs + SUBMENU:=$(FS_MENU) + TITLE:=Network Filesystems support + DEPENDS:=@LINUX_5_15 + KCONFIG:= CONFIG_NETFS_SUPPORT + FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko + AUTOLOAD:=$(call AutoLoad,28,netfs) +endef + +$(eval $(call KernelPackage,fs-netfs)) + define KernelPackage/fs-fscache SUBMENU:=$(FS_MENU) TITLE:=General filesystem local cache manager - DEPENDS:= + DEPENDS:=+kmod-fs-netfs KCONFIG:=\ CONFIG_FSCACHE=m \ CONFIG_FSCACHE_STATS=y \ @@ -378,9 +394,20 @@ endef $(eval $(call KernelPackage,fs-nfs)) +define KernelPackage/fs-nfs-ssc + SUBMENU:=$(FS_MENU) + TITLE:=Common NFS filesystem SSC Helper module + KCONFIG:= CONFIG_NFS_V4_2@ge5.15 + FILES:= $(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko@ge5.10 + AUTOLOAD:=$(call AutoLoad,30,nfs_ssc) +endef + +$(eval $(call KernelPackage,fs-nfs-ssc)) + define KernelPackage/fs-nfs-common SUBMENU:=$(FS_MENU) TITLE:=Common NFS filesystem modules + DEPENDS:=+LINUX_5_10:kmod-fs-nfs-ssc KCONFIG:= \ CONFIG_LOCKD \ CONFIG_SUNRPC \ @@ -388,8 +415,7 @@ define KernelPackage/fs-nfs-common FILES:= \ $(LINUX_DIR)/fs/lockd/lockd.ko \ $(LINUX_DIR)/net/sunrpc/sunrpc.ko \ - $(LINUX_DIR)/fs/nfs_common/grace.ko \ - $(LINUX_DIR)/fs/nfs_common/nfs_ssc.ko@eq5.10 + $(LINUX_DIR)/fs/nfs_common/grace.ko AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd) endef @@ -408,15 +434,15 @@ define KernelPackage/fs-nfs-common-rpcsec +kmod-crypto-sha1 \ +kmod-crypto-hmac \ +kmod-crypto-ecb \ - +kmod-crypto-arc4 + +kmod-crypto-arc4 \ + +kmod-oid-registry KCONFIG:= \ CONFIG_SUNRPC_GSS \ CONFIG_RPCSEC_GSS_KRB5 FILES:= \ - $(LINUX_DIR)/lib/oid_registry.ko \ $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko \ $(LINUX_DIR)/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko - AUTOLOAD:=$(call AutoLoad,31,oid_registry auth_rpcgss rpcsec_gss_krb5) + AUTOLOAD:=$(call AutoLoad,31,auth_rpcgss rpcsec_gss_krb5) endef define KernelPackage/fs-nfs-common-rpcsec/description @@ -445,7 +471,7 @@ $(eval $(call KernelPackage,fs-nfs-v3)) define KernelPackage/fs-nfs-v4 SUBMENU:=$(FS_MENU) TITLE:=NFS4 filesystem client support - DEPENDS:=+kmod-fs-nfs + DEPENDS:=+kmod-fs-nfs +LINUX_5_15:kmod-fs-nfs-ssc KCONFIG:= \ CONFIG_NFS_V4=y FILES:= \ diff --git a/root/package/kernel/linux/modules/input.mk b/root/package/kernel/linux/modules/input.mk index 6f9500d4..e052a7af 100755 --- a/root/package/kernel/linux/modules/input.mk +++ b/root/package/kernel/linux/modules/input.mk @@ -179,10 +179,10 @@ define KernelPackage/input-touchscreen-ads7846 DEPENDS:=+kmod-hwmon-core +kmod-input-core +kmod-spi-bitbang KCONFIG:= \ CONFIG_INPUT_TOUCHSCREEN=y \ - CONFIG_TOUCHSCREEN_PROPERTIES=y \ + CONFIG_TOUCHSCREEN_PROPERTIES=y@lt5.13 \ CONFIG_TOUCHSCREEN_ADS7846 FILES:=$(LINUX_DIR)/drivers/input/touchscreen/ads7846.ko \ - $(LINUX_DIR)/drivers/input/touchscreen/of_touchscreen.ko@lt5.14 + $(LINUX_DIR)/drivers/input/touchscreen/of_touchscreen.ko@lt5.13 AUTOLOAD:=$(call AutoProbe,ads7846) endef @@ -196,7 +196,7 @@ $(eval $(call KernelPackage,input-touchscreen-ads7846)) define KernelPackage/keyboard-imx SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=IMX keypad support - DEPENDS:=@(TARGET_mxs||TARGET_imx6) +kmod-input-matrixkmap + DEPENDS:=@(TARGET_mxs||TARGET_imx) +kmod-input-matrixkmap KCONFIG:= \ CONFIG_KEYBOARD_IMX \ CONFIG_INPUT_KEYBOARD=y diff --git a/root/package/kernel/linux/modules/netfilter.mk b/root/package/kernel/linux/modules/netfilter.mk index 7d185802..725441ab 100755 --- a/root/package/kernel/linux/modules/netfilter.mk +++ b/root/package/kernel/linux/modules/netfilter.mk @@ -150,11 +150,13 @@ define KernelPackage/nf-flow TITLE:=Netfilter flowtable support KCONFIG:= \ CONFIG_NETFILTER_INGRESS=y \ - CONFIG_NF_FLOW_TABLE + CONFIG_NF_FLOW_TABLE \ + CONFIG_NF_FLOW_TABLE_HW DEPENDS:=+kmod-nf-conntrack FILES:= \ - $(LINUX_DIR)/net/netfilter/nf_flow_table.ko - AUTOLOAD:=$(call AutoProbe,nf_flow_table) + $(LINUX_DIR)/net/netfilter/nf_flow_table.ko \ + $(if $(CONFIG_LINUX_5_4),$(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko) + AUTOLOAD:=$(call AutoProbe,nf_flow_table nf_flow_table_hw) endef $(eval $(call KernelPackage,nf-flow)) @@ -1085,7 +1087,7 @@ define KernelPackage/nft-bridge FILES:=$(foreach mod,$(NFT_BRIDGE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_BRIDGE-m))) KCONFIG:= \ - CONFIG_NF_LOG_BRIDGE=n \ + CONFIG_NF_LOG_BRIDGE=n@lt5.13 \ $(KCONFIG_NFT_BRIDGE) endef diff --git a/root/package/kernel/linux/modules/other.mk b/root/package/kernel/linux/modules/other.mk index 12bf1872..33e36ef8 100755 --- a/root/package/kernel/linux/modules/other.mk +++ b/root/package/kernel/linux/modules/other.mk @@ -52,8 +52,10 @@ define KernelPackage/bluetooth $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.ko \ $(LINUX_DIR)/net/bluetooth/bnep/bnep.ko \ $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ - $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko - AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart) + $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ + $(LINUX_DIR)/drivers/bluetooth/btusb.ko \ + $(LINUX_DIR)/drivers/bluetooth/btintel.ko + AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb) endef define KernelPackage/bluetooth/description @@ -126,7 +128,7 @@ define KernelPackage/dma-buf KCONFIG:=CONFIG_DMA_SHARED_BUFFER ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") - FILES:=$(LINUX_DIR)/drivers/dma-buf/dma-shared-buffer.ko@lt5.14 + FILES:=$(LINUX_DIR)/drivers/dma-buf/dma-shared-buffer.ko endif endif AUTOLOAD:=$(call AutoLoad,20,dma-shared-buffer) @@ -180,22 +182,6 @@ endef $(eval $(call KernelPackage,eeprom-at25)) -define KernelPackage/gpio-dev - SUBMENU:=$(OTHER_MENU) - TITLE:=Generic GPIO char device support - DEPENDS:=@GPIO_SUPPORT - KCONFIG:=CONFIG_GPIO_DEVICE - FILES:=$(LINUX_DIR)/drivers/char/gpio_dev.ko - AUTOLOAD:=$(call AutoLoad,40,gpio_dev) -endef - -define KernelPackage/gpio-dev/description - Kernel module to allows control of GPIO pins using a character device. -endef - -$(eval $(call KernelPackage,gpio-dev)) - - define KernelPackage/gpio-f7188x SUBMENU:=$(OTHER_MENU) TITLE:=Fintek F718xx/F818xx GPIO Support @@ -912,7 +898,6 @@ $(eval $(call KernelPackage,ikconfig)) define KernelPackage/zram SUBMENU:=$(OTHER_MENU) TITLE:=ZRAM - DEPENDS:=+kmod-lib-lzo KCONFIG:= \ CONFIG_ZSMALLOC \ CONFIG_ZRAM \ @@ -929,8 +914,31 @@ define KernelPackage/zram/description Compressed RAM block device support endef -$(eval $(call KernelPackage,zram)) +define KernelPackage/zram/config + choice + prompt "ZRAM Default compressor" + default ZRAM_DEF_COMP_LZORLE + config ZRAM_DEF_COMP_LZORLE + bool "lzo-rle" + select PACKAGE_kmod-lib-lzo + + config ZRAM_DEF_COMP_LZO + bool "lzo" + select PACKAGE_kmod-lib-lzo + + config ZRAM_DEF_COMP_LZ4 + bool "lz4" + select PACKAGE_kmod-lib-lz4 + + config ZRAM_DEF_COMP_ZSTD + bool "zstd" + select PACKAGE_kmod-lib-zstd + + endchoice +endef + +$(eval $(call KernelPackage,zram)) define KernelPackage/pps SUBMENU:=$(OTHER_MENU) @@ -1006,7 +1014,7 @@ $(eval $(call KernelPackage,ptp)) define KernelPackage/ptp-qoriq SUBMENU:=$(OTHER_MENU) TITLE:=Freescale QorIQ PTP support - DEPENDS:=@TARGET_mpc85xx +kmod-ptp + DEPENDS:=@(TARGET_mpc85xx||TARGET_qoriq) +kmod-ptp KCONFIG:=CONFIG_PTP_1588_CLOCK_QORIQ FILES:=$(LINUX_DIR)/drivers/ptp/ptp-qoriq.ko AUTOLOAD:=$(call AutoProbe,ptp-qoriq) @@ -1143,7 +1151,8 @@ $(eval $(call KernelPackage,keys-trusted)) define KernelPackage/tpm SUBMENU:=$(OTHER_MENU) TITLE:=TPM Hardware Support - DEPENDS:= +kmod-random-core + DEPENDS:= +kmod-random-core +(LINUX_5_15):kmod-asn1-decoder \ + +(LINUX_5_15):kmod-asn1-encoder +(LINUX_5_15):kmod-oid-registry KCONFIG:= CONFIG_TCG_TPM FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko AUTOLOAD:=$(call AutoLoad,10,tpm,1) @@ -1270,3 +1279,36 @@ define KernelPackage/f71808e-wdt/description endef $(eval $(call KernelPackage,f71808e-wdt)) + + +define KernelPackage/qcom-qmi-helpers + SUBMENU:=$(OTHER_MENU) + TITLE:=Qualcomm QMI Helpers + KCONFIG:=CONFIG_QCOM_QMI_HELPERS + FILES:=$(LINUX_DIR)/drivers/soc/qcom/qmi_helpers.ko + AUTOLOAD:=$(call AutoProbe,qmi_helpers) +endef + +define KernelPackage/qcom-qmi-helpers/description + Qualcomm QMI Helpers +endef + +$(eval $(call KernelPackage,qcom-qmi-helpers)) + +define KernelPackage/mhi + SUBMENU:=$(OTHER_MENU) + TITLE:=Modem Host Interface (MHI) bus + DEPENDS:=@LINUX_5_15 + KCONFIG:=CONFIG_MHI_BUS \ + CONFIG_MHI_BUS_DEBUG=y \ + CONFIG_MHI_BUS_PCI_GENERIC=n \ + CONFIG_MHI_NET=n + FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko + AUTOLOAD:=$(call AutoProbe,mhi) +endef + +define KernelPackage/mhi/description + Bus driver for MHI protocol. +endef + +$(eval $(call KernelPackage,mhi)) diff --git a/root/package/kernel/linux/modules/sound.mk b/root/package/kernel/linux/modules/sound.mk index 14bdf3ab..83b3355f 100755 --- a/root/package/kernel/linux/modules/sound.mk +++ b/root/package/kernel/linux/modules/sound.mk @@ -30,7 +30,7 @@ SOUNDCORE_FILES ?= \ $(LINUX_DIR)/sound/core/snd-pcm.ko \ $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \ $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko \ - $(LINUX_DIR)/sound/core/snd-compress.ko@lt5.14 + $(LINUX_DIR)/sound/core/snd-compress.ko SOUNDCORE_LOAD += \ $(if $(CONFIG_SND_DMAENGINE_PCM),snd-pcm-dmaengine) @@ -225,12 +225,12 @@ define KernelPackage/sound-soc-imx $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \ $(LINUX_DIR)/sound/soc/fsl/imx-pcm-dma.ko AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm) - DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core + DEPENDS:=@TARGET_imx +kmod-sound-soc-core $(call AddDepends/sound) endef define KernelPackage/sound-soc-imx/description - Support for i.MX6 Platform sound (ssi/audmux/pcm) + Support for i.MX Platform sound (ssi/audmux/pcm) endef $(eval $(call KernelPackage,sound-soc-imx)) @@ -243,12 +243,12 @@ define KernelPackage/sound-soc-imx-sgtl5000 $(LINUX_DIR)/sound/soc/codecs/snd-soc-sgtl5000.ko \ $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-sgtl5000.ko AUTOLOAD:=$(call AutoLoad,57,snd-soc-sgtl5000 snd-soc-imx-sgtl5000) - DEPENDS:=@TARGET_imx6 +kmod-sound-soc-imx + DEPENDS:=@TARGET_imx +kmod-sound-soc-imx +kmod-regmap-i2c $(call AddDepends/sound) endef define KernelPackage/sound-soc-imx-sgtl5000/description - Support for i.MX6 Platform sound SGTL5000 codec + Support for i.MX Platform sound SGTL5000 codec endef $(eval $(call KernelPackage,sound-soc-imx-sgtl5000))