kernel: mpc85xx: fix build of kmod-usb2-fsl
Fix buildbot error for mpc85xx. ehci-fsl.ko should be packaged inside the usb2 package, because it depends on the ehci kernel module. The fsl-mph-dr-of.ko module can stay in an own package because the ehci driver depends on it. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48932
This commit is contained in:
		@@ -365,13 +365,10 @@ $(eval $(call KernelPackage,usb-ohci-pci))
 | 
				
			|||||||
define KernelPackage/usb2-fsl
 | 
					define KernelPackage/usb2-fsl
 | 
				
			||||||
  TITLE:=Support for Freescale USB2 controllers
 | 
					  TITLE:=Support for Freescale USB2 controllers
 | 
				
			||||||
  DEPENDS:=@TARGET_mpc85xx
 | 
					  DEPENDS:=@TARGET_mpc85xx
 | 
				
			||||||
  KCONFIG:=\
 | 
					  HIDDEN:=1
 | 
				
			||||||
	CONFIG_USB_FSL_MPH_DR_OF \
 | 
					  KCONFIG:=CONFIG_USB_FSL_MPH_DR_OF
 | 
				
			||||||
	CONFIG_USB_EHCI_FSL
 | 
					  FILES:=$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko
 | 
				
			||||||
  FILES:= \
 | 
					  AUTOLOAD:=$(call AutoLoad,39,fsl-mph-dr-of,1)
 | 
				
			||||||
	$(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko \
 | 
					 | 
				
			||||||
	$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko
 | 
					 | 
				
			||||||
  AUTOLOAD:=$(call AutoLoad,39,ehci-fsl fsl-mph-dr-of,1)
 | 
					 | 
				
			||||||
  $(call AddDepends/usb)
 | 
					  $(call AddDepends/usb)
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -439,7 +436,8 @@ define KernelPackage/usb2
 | 
				
			|||||||
	CONFIG_USB_OCTEON_EHCI=y \
 | 
						CONFIG_USB_OCTEON_EHCI=y \
 | 
				
			||||||
	CONFIG_USB_EHCI_HCD_ORION=y \
 | 
						CONFIG_USB_EHCI_HCD_ORION=y \
 | 
				
			||||||
	CONFIG_USB_EHCI_HCD_PLATFORM=y \
 | 
						CONFIG_USB_EHCI_HCD_PLATFORM=y \
 | 
				
			||||||
	CONFIG_USB_EHCI_HCD_AT91=y
 | 
						CONFIG_USB_EHCI_HCD_AT91=y \
 | 
				
			||||||
 | 
						CONFIG_USB_EHCI_FSL
 | 
				
			||||||
  FILES:= \
 | 
					  FILES:= \
 | 
				
			||||||
	$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \
 | 
						$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \
 | 
				
			||||||
	$(LINUX_DIR)/drivers/usb/host/ehci-platform.ko
 | 
						$(LINUX_DIR)/drivers/usb/host/ehci-platform.ko
 | 
				
			||||||
@@ -449,7 +447,10 @@ define KernelPackage/usb2
 | 
				
			|||||||
  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),)
 | 
					  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),)
 | 
				
			||||||
    FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko
 | 
					    FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko
 | 
				
			||||||
  endif
 | 
					  endif
 | 
				
			||||||
  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel,1)
 | 
					  ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko),)
 | 
				
			||||||
 | 
					    FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko
 | 
				
			||||||
 | 
					  endif
 | 
				
			||||||
 | 
					  AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel ehci-fsl,1)
 | 
				
			||||||
  $(call AddDepends/usb)
 | 
					  $(call AddDepends/usb)
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user