LINARO: WORKAROUND: fix omap build

Turn off musb and ignore some missing modules

Signed-off-by: John Rigby <john.rigby@linaro.org>

7 files changed, 13 insertions, 17 deletions

diff --git a/debian.linaro/abi/2.6.39-1000.1/modules.ignore b/debian.linaro/abi/2.6.39-1000.1/modules.ignore
new file mode 100644
index 00000000000..926450ad596
--- /dev/null
+++ b/debian.linaro/abi/2.6.39-1000.1/modules.ignore
@@ -0,0 +1,12 @@
+cfbcopyarea
+cfbfillrect
+cfbimgblt
+omapdss
+omapfb
+panel-acx565akm
+panel-generic-dpi
+panel-nec-nl8048hl11-01b
+panel-sharp-ls037v7dw01
+panel-taal
+panel-tpo-td043mtea1
+
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index b3a3833b2e0..e76f7b4a019 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -248,7 +248,6 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_LIBUSUAL is not set
 # CONFIG_USB_MON is not set
-# CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_USBNET is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index c2bd4b7d9ea..79019364e0d 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -308,7 +308,6 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_LIBUSUAL=y
 CONFIG_USB_MON=y
-CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_TEST=y
 CONFIG_USB_USBNET=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index e96bbbf7fc2..4444f12278c 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -221,7 +221,6 @@ CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_LIBUSUAL is not set
 # CONFIG_USB_MON is not set
-# CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_WDM is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 33ff901db64..eacf935d1fa 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -224,7 +224,6 @@ CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_LIBUSUAL is not set
 # CONFIG_USB_MON is not set
-# CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_WDM is not set
 CONFIG_USER_NS=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 6f330d021fc..488bb5e0e47 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -284,7 +284,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_ISP1760_HCD=y
 # CONFIG_USB_LIBUSUAL is not set
 CONFIG_USB_MON=y
-# CONFIG_USB_MUSB_HDRC is not set
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_USBNET is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 276dabf9e83..131999cd3d7 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -1113,7 +1113,6 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-# CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_MXC_DEBUG_BOARD=y
 # CONFIG_MXC_IRQ_PRIOR is not set
 # CONFIG_MXC_PWM is not set
@@ -1856,7 +1855,6 @@ CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_FUSB300=y
 # CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_MUSB_HDRC is not set
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_R8A66597 is not set
@@ -1873,7 +1871,6 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HWA_HCD is not set
 # CONFIG_USB_IDMOUSE is not set
-CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_IPHETH is not set
 # CONFIG_USB_IP_COMMON is not set
@@ -1890,14 +1887,7 @@ CONFIG_USB_MASS_STORAGE=m
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_MUSB_AM35X is not set
-# CONFIG_USB_MUSB_DEBUG is not set
-CONFIG_USB_MUSB_HDRC_HCD=y
-# CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_MUSB_OTG=y
-# CONFIG_USB_MUSB_PERIPHERAL is not set
-# CONFIG_USB_MUSB_TUSB6010 is not set
+# CONFIG_USB_MUSB_HDRC is not set
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_CDCETHER=y
 # CONFIG_USB_NET_CDC_EEM is not set
@@ -1951,7 +1941,6 @@ CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_STORAGE_USBAT is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
-# CONFIG_USB_TI_CPPI_DMA is not set
 # CONFIG_USB_TMC is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_UAS is not set