ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-25 02:46:48 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

kernel: module updates for 3.12

Browse Source 
Signed-off-by: Tim Harvey <tharvey@gateworks.com>

SVN-Revision: 39008
This commit is contained in:
Luka Perkov 2013-12-09 11:30:18 +00:00
parent ef5e13325e
commit 98009790c6
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/kernel/linux/modules/sound.mk
View File

@ -190,6 +190,7 @@ $(eval $(call KernelPackage,sound-soc-ac97))
define KernelPackage/sound-soc-imx define KernelPackage/sound-soc-imx
TITLE:=IMX SoC support TITLE:=IMX SoC support
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1)
KCONFIG:=\ KCONFIG:=\
CONFIG_SND_IMX_SOC \ CONFIG_SND_IMX_SOC \
CONFIG_SND_SOC_IMX_AUDMUX \ CONFIG_SND_SOC_IMX_AUDMUX \
@ -200,6 +201,18 @@ define KernelPackage/sound-soc-imx
$(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \ $(LINUX_DIR)/sound/soc/fsl/snd-soc-fsl-ssi.ko \
$(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-pcm.ko $(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-pcm.ko
AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm) AUTOLOAD:=$(call AutoLoad,56,snd-soc-imx-audmux snd-soc-fsl-ssi snd-soc-imx-pcm)
else
KCONFIG:=\
CONFIG_SND_IMX_SOC \
CONFIG_SND_SOC_IMX_AUDMUX \
CONFIG_SND_SOC_FSL_SSI \
CONFIG_SND_SOC_IMX_PCM_DMA
FILES:= \
$(LINUX_DIR)/sound/soc/fsl/snd-soc-imx-audmux.ko \
$(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)
endif
DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core DEPENDS:=@TARGET_imx6 +kmod-sound-soc-core
$(call AddDepends/sound) $(call AddDepends/sound)
endef endef

14
package/kernel/linux/modules/usb.mk
View File

@ -737,7 +737,13 @@ define KernelPackage/usb-net
TITLE:=Kernel modules for USB-to-Ethernet convertors TITLE:=Kernel modules for USB-to-Ethernet convertors
KCONFIG:=CONFIG_USB_USBNET CONFIG_MII=y KCONFIG:=CONFIG_USB_USBNET CONFIG_MII=y
AUTOLOAD:=$(call AutoProbe,usbnet) AUTOLOAD:=$(call AutoProbe,usbnet)
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.12.0)),1)
FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko
else
FILES:=\
$(LINUX_DIR)/drivers/$(USBNET_DIR)/usbnet.ko \
$(LINUX_DIR)/drivers/net/mii.ko
endif
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef
@ -1063,11 +1069,19 @@ define KernelPackage/usb-chipidea
CONFIG_USB_CHIPIDEA_HOST=y \ CONFIG_USB_CHIPIDEA_HOST=y \
CONFIG_USB_CHIPIDEA_UDC=n \ CONFIG_USB_CHIPIDEA_UDC=n \
CONFIG_USB_CHIPIDEA_DEBUG=y CONFIG_USB_CHIPIDEA_DEBUG=y
ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.11.0)),1)
FILES:=\ FILES:=\
$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
$(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko) \ $(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/ci13xxx_imx.ko) \
$(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q).ko) $(if $(CONFIG_OF_DEVICE),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q).ko)
AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF_DEVICE),ci13xxx_imx usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q)),1) AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF_DEVICE),ci13xxx_imx usbmisc_imx$(if $(call kernel_patchver_le,3.9),6q)),1)
else
FILES:=\
$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko) \
$(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko)
AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1)
endif
$(call AddDepends/usb) $(call AddDepends/usb)
endef endef