fix usb for 3.10.30

mk/modules.mk

@@ -506,17 +506,6 @@ $(eval $(call KMOD_template,NF_CONNTRACK_TFTP,nf-conntrack-tftp,\
 	$(MODULES_DIR)/kernel/net/netfilter/nf_nat_tftp \
 ,55))
 
-#$(eval $(call KMOD_template,NF_CONNTRACK_RTSP,nf-conntrack-rtsp,\
-#	$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_rtsp \
-#	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_rtsp \
-#,55))
-
-# broken
-#$(eval $(call KMOD_template,NF_CONNTRACK_AMANDA,nf-conntrack-amanda,\
-#	$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_amanda \
-#	$(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_amanda \
-#,55))
-
 $(eval $(call KMOD_template,NF_CONNTRACK_PPTP,nf-conntrack-pptp,\
 	$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_proto_gre \
 	$(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_pptp \
@@ -1133,10 +1122,6 @@ $(eval $(call KMOD_template,NFS_FS,nfs-fs,\
 ,30, kmod-sunrpc))
 endif
 
-#$(eval $(call KMOD_template,EXPORTFS,exportfs,\
-#	$(MODULES_DIR)/kernel/fs/exportfs/exportfs \
-#,20))
-
 $(eval $(call KMOD_template,NFSD,nfsd,\
         $(MODULES_DIR)/kernel/fs/nfsd/nfsd \
 ,30, kmod-sunrpc kmod-lockd))
@@ -1193,16 +1178,29 @@ $(eval $(call KMOD_template,SOUND,sound,\
 $(eval $(call KMOD_template,SND,snd,\
 	$(MODULES_DIR)/kernel/sound/core/snd \
 	$(MODULES_DIR)/kernel/sound/core/snd-timer \
-	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
 ,40))
 
+
+ifeq ($(KERNEL_BASE),3)
+ifeq ($(KERNEL_MAJ),10)
+$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
+	$(MODULES_DIR)/kernel/sound/core/snd-page-alloc \
+	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
+,41))
+else
+$(eval $(call KMOD_template,SND_PCM,snd-pcm,\
+	$(MODULES_DIR)/kernel/sound/core/snd-pcm \
+,41))
+endif
+endif
+
 $(eval $(call KMOD_template,SND_PCM_DMAENGINE,snd-pcm-dmaengine,\
 	$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
-,41))
+,42))
 
 $(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\
 	$(MODULES_DIR)/kernel/sound/core/snd-compress \
-,41))
+,42))
 
 $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
 	$(MODULES_DIR)/kernel/sound/core/snd-hwdep \
@@ -1354,11 +1352,19 @@ $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\
 	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \
 ,55))
 
+$(eval $(call KMOD_template,USB_MXS_PHY,usb-mxs-phy,\
+	$(MODULES_DIR)/kernel/drivers/usb/phy/phy-mxs-usb \
+,56))
+
+$(eval $(call KMOD_template,USB_GADGET,usb-gadget,\
+	$(MODULES_DIR)/kernel/drivers/usb/gadget/udc-core \
+,57))
+
 $(eval $(call KMOD_template,USB_CHIPIDEA,ci-hdrc,\
 	$(MODULES_DIR)/kernel/drivers/usb/chipidea/ci_hdrc \
 	$(MODULES_DIR)/kernel/drivers/usb/chipidea/usbmisc_imx \
 	$(MODULES_DIR)/kernel/drivers/usb/chipidea/ci_hdrc_imx \
-,56))
+,58, kmod-usb-gadget kmod-usb-mxs-phy))
 
 $(eval $(call KMOD_template,USB_OHCI_HCD,usb-ohci-hcd,\
 	$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd \

target/arm/cubox-i/patches/3.10.30/exportfs-boolean.patch

@@ -0,0 +1,12 @@
+diff -Nur linux-3.10.30.orig/fs/Kconfig linux-3.10.30/fs/Kconfig
+--- linux-3.10.30.orig/fs/Kconfig	2014-02-13 22:48:15.000000000 +0100
++++ linux-3.10.30/fs/Kconfig	2014-05-19 20:41:23.637038598 +0200
+@@ -51,7 +51,7 @@
+ 	def_bool n
+ 
+ config EXPORTFS
+-	tristate
++	def_bool y
+ 
+ config FILE_LOCKING
+ 	bool "Enable POSIX file locking API" if EXPERT

target/arm/cubox-i/patches/3.10.30/regmap-boolean.patch

@@ -0,0 +1,20 @@
+diff -Nur linux-3.10.30.orig/drivers/base/regmap/Kconfig linux-3.10.30/drivers/base/regmap/Kconfig
+--- linux-3.10.30.orig/drivers/base/regmap/Kconfig	2014-02-13 22:48:15.000000000 +0100
++++ linux-3.10.30/drivers/base/regmap/Kconfig	2014-05-19 18:38:14.558461284 +0200
+@@ -10,13 +10,13 @@
+ 	bool
+ 
+ config REGMAP_I2C
+-	tristate
++	boolean
+ 
+ config REGMAP_SPI
+-	tristate
++	boolean
+ 
+ config REGMAP_MMIO
+-	tristate
++	boolean
+ 
+ config REGMAP_IRQ
+ 	bool

target/linux/config/Config.in.audio

@@ -14,7 +14,7 @@ config ADK_KERNEL_SND_ARM
 	boolean
 
 config ADK_KERNEL_SND_SOC_GENERIC_DMAENGINE_PCM
-	tristate
+	boolean
 
 config ADK_KERNEL_SND_SOC_FSL_SPDIF
 	tristate

target/linux/config/Config.in.usb

@@ -10,9 +10,18 @@ config ADK_KERNEL_USB_EHCI_ROOT_HUB_TT
 config ADK_KERNEL_USB_EHCI_TT_NEWSCHED
 	boolean
 
-config ADK_KERNEL_USB_MXS_PHY
+config ADK_KERNEL_USB_GADGET
+	tristate
+
+config ADK_KERNEL_USB_PHY
 	boolean
 
+config ADK_KERNEL_USB_MXS_PHY
+	tristate
+	select ADK_KERNEL_USB_PHY
+	default m if ADK_TARGET_SYSTEM_CUBOX_I
+	default n
+
 config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
 	boolean
 	select ADK_KERNEL_USB_OHCI_HCD
@@ -162,6 +171,7 @@ config ADK_KERNEL_USB_CHIPIDEA
 	tristate
 	select ADK_KERNEL_USB_CHIPIDEA_UDC
 	select ADK_KERNEL_USB_CHIPIDEA_HOST
+	select ADK_KERNEL_USB_GADGET
 	depends on ADK_KERNEL_USB_EHCI_HCD
 	default m if ADK_TARGET_SYSTEM_CUBOX_I
 	default n