From e9d7da1e99d765abc02bd6765c2525420b7c6702 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Apr 2008 10:20:20 +0000 Subject: linux-omap2 git: modify beagle defconfig and add usb timeout patch --- .../linux/linux-omap2-git/beagleboard/defconfig | 48 ++++++++++++++++++---- .../linux-omap2-git/beagleboard/usb-timout.patch | 11 +++++ packages/linux/linux-omap2_git.bb | 7 ++-- 3 files changed, 54 insertions(+), 12 deletions(-) create mode 100644 packages/linux/linux-omap2-git/beagleboard/usb-timout.patch (limited to 'packages') diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 9a66d7a94a..135e9c48d2 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25-omap1 -# Thu Apr 24 21:02:00 2008 +# Wed Apr 30 11:44:55 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -941,9 +941,10 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_COMMON=y -# CONFIG_VIDEO_V4L1 is not set +CONFIG_VIDEO_ALLOW_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set @@ -973,11 +974,21 @@ CONFIG_VIDEO_WM8775=m # # Video decoders # +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_OV9640 is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA7111 is not set +# CONFIG_VIDEO_SAA7114 is not set CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_VPX3220 is not set # # Video and audio decoders @@ -993,6 +1004,9 @@ CONFIG_VIDEO_CX2341X=m # Video encoders # # CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set # # Video improvement chips @@ -1000,22 +1014,39 @@ CONFIG_VIDEO_CX2341X=m # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set CONFIG_VIDEO_VIVI=m +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_AU0828 is not set CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DVB is not set # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_ALSA=m +# CONFIG_VIDEO_EM28XX_DVB is not set CONFIG_VIDEO_USBVISION=m +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set CONFIG_USB_ET61X251=m +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set CONFIG_USB_SN9C102=m +# CONFIG_USB_STV680 is not set CONFIG_USB_ZC0301=m +# CONFIG_USB_PWC is not set CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m +# CONFIG_SOC_CAMERA is not set # CONFIG_RADIO_ADAPTERS is not set CONFIG_DVB_CORE=m CONFIG_DVB_CORE_ATTACH=y @@ -1094,6 +1125,7 @@ CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m +# CONFIG_DVB_TDA10048 is not set # # DVB-C (cable) frontends @@ -1112,6 +1144,7 @@ CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m CONFIG_DVB_S5H1409=m +# CONFIG_DVB_AU8522 is not set # # Tuners/PLL support @@ -1126,11 +1159,13 @@ CONFIG_DVB_TUNER_MT2266=m CONFIG_DVB_TUNER_MT2131=m CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_TUNER_XC5000=m +# CONFIG_DVB_TUNER_ITD1000 is not set # # Miscellaneous devices # CONFIG_DVB_LNBP21=m +# CONFIG_DVB_ISL6405 is not set CONFIG_DVB_ISL6421=m CONFIG_DVB_TUA6100=m CONFIG_VIDEO_TUNER=m @@ -1262,10 +1297,6 @@ CONFIG_SND_USB_CAIAQ=m # CONFIG_SND_SOC=y -# -# SoC Audio support for SuperH -# - # # ALSA SoC audio for Freescale SOCs # @@ -1312,7 +1343,7 @@ CONFIG_USB_SUSPEND=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y @@ -1434,7 +1465,7 @@ CONFIG_USB_LED=m # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set -CONFIG_USB_SISUSBVGA=y +CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set @@ -1638,7 +1669,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y -# CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set CONFIG_ROOT_NFS=y CONFIG_LOCKD=y diff --git a/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch b/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch new file mode 100644 index 0000000000..2d1797cb66 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch @@ -0,0 +1,11 @@ +--- /tmp/ehci-hub.c 2008-04-30 11:41:59.381876290 +0200 ++++ git/drivers/usb/host/ehci-hub.c 2008-04-30 11:42:20.522875367 +0200 +@@ -734,7 +734,7 @@ + * this bit; seems too long to spin routinely... + */ + retval = handshake(ehci, status_reg, +- PORT_RESET, 0, 750); ++ PORT_RESET, 0, 1250); + if (retval != 0) { + ehci_err (ehci, "port %d reset error %d\n", + wIndex + 1, retval); diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index f8c50f7c55..4a3c3faf01 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,16 +2,17 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "b1224e0086dc0b27a5af1e7b4f59709521569060" +SRCREV = "59586cd959b31f91f29cf96c1d3f8ff52c3c0607" PV = "2.6.25+git${SRCREV}" -PR = "r5" +PR = "r6" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ - file://defconfig" + file://defconfig" SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ + file://usb-timout.patch;patch=1 \ " COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard" -- cgit v1.2.3