Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 18 insertions, 15 deletions

diff --git a/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch
index d778423d1b..0166de651a 100644
--- a/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch
+++ b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch
@@ -4,8 +4,8 @@
  	NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
  	0, FB_VMODE_NONINTERLACED
      }, {
-+	/* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */
-+	"hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5,
++	/* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-E Format 4 */
++	"hd720", 60, 1280, 720, 13468, 220, 110, 20, 5, 40, 5,
 +	0, FB_VMODE_NONINTERLACED
 +    }, {
  	/* 800x600 @ 56 Hz, 35.15 kHz hsync */
diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
index fcbe27c803..ef5e35c99f 100644
--- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-omap1
-# Mon Apr  6 15:31:26 2009
+# Tue Apr  7 18:11:42 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -456,12 +456,15 @@ CONFIG_BT_HIDP=y
 #
 # Bluetooth device drivers
 #
-# CONFIG_BT_HCIBTUSB is not set
+CONFIG_BT_HCIBTUSB=y
 CONFIG_BT_HCIBTSDIO=y
-# CONFIG_BT_HCIUART is not set
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIBCM203X=y
 CONFIG_BT_HCIBPA10X=y
-# CONFIG_BT_HCIBFUSB is not set
+CONFIG_BT_HCIBFUSB=y
 # CONFIG_BT_HCIBRF6150 is not set
 # CONFIG_BT_HCIH4P is not set
 # CONFIG_BT_HCIVHCI is not set
diff --git a/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch
index d778423d1b..0166de651a 100644
--- a/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch
+++ b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch
@@ -4,8 +4,8 @@
  	NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
  	0, FB_VMODE_NONINTERLACED
      }, {
-+	/* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */
-+	"hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5,
++	/* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-E Format 4 */
++	"hd720", 60, 1280, 720, 13468, 220, 110, 20, 5, 40, 5,
 +	0, FB_VMODE_NONINTERLACED
 +    }, {
  	/* 800x600 @ 56 Hz, 35.15 kHz hsync */
diff --git a/recipes/linux/linux-omap-2.6.29/overo/defconfig b/recipes/linux/linux-omap-2.6.29/overo/defconfig
index e5b59e619b..0101ca5099 100644
--- a/recipes/linux/linux-omap-2.6.29/overo/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/overo/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-omap1
-# Sat Apr  4 17:29:08 2009
+# Wed Apr  8 18:20:57 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -200,6 +200,7 @@ CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_MUX is not set
 CONFIG_OMAP_MCBSP=y
 # CONFIG_OMAP_MBOX_FWK is not set
+# CONFIG_OMAP_IOMMU is not set
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
@@ -456,8 +457,8 @@ CONFIG_BT_HIDP=y
 #
 # Bluetooth device drivers
 #
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIBTUSB=y
+CONFIG_BT_HCIBTSDIO=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
@@ -1185,6 +1186,7 @@ CONFIG_VIDEO_CX2341X=m
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_VIDEO_AU0828 is not set
+# CONFIG_VIDEO_OMAP3 is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
@@ -1455,10 +1457,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SND=y
@@ -1740,6 +1739,7 @@ CONFIG_USB_OTG_UTILS=y
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_ISP1301_OMAP is not set
 CONFIG_TWL4030_USB=y
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set