Merge branch 'master' into openelec-pvr-master

Conflicts: projects/ATV/options projects/Generic/options projects/ION/options projects/Intel/options
2025-07-24 11:16:51 +00:00 · 2011-03-20 12:02:47 +01:00 · 2011-03-20 12:02:47 +01:00 · e609d14eb9
commit e609d14eb9
parent db9948d859 a9d3e9bd71
69 changed files with 17723 additions and 32660 deletions
--- a/config/options
+++ b/config/options
@ -88,6 +88,7 @@ get_graphicdrivers() {
    [ "$drv" = "r600" ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
    [ "$drv" = "radeon" ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
    [ "$drv" = "nouveau" ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
+    [ "$drv" = "omapfb" ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"

    if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
      XORG_DRIVERS="$XORG_DRIVERS intel"
@ -106,6 +107,10 @@ get_graphicdrivers() {
      XINERAMA_SUPPORT="yes"
    fi

+    if [ "$drv" = "omapfb" ]; then
+      XORG_DRIVERS="$XORG_DRIVERS ompafb"
+    fi
+
    if [ "$drv" = "vmware" ]; then
      XINERAMA_SUPPORT="yes"
    fi
--- a/packages/databases/mysql/build
+++ b/packages/databases/mysql/build
@ -22,6 +22,9 @@

 . config/options $1

+# mysql fails to build with LTO support
+  strip_lto
+
 cd $PKG_BUILD
 ac_cv_c_stack_direction=-1 \
 ac_cv_sys_restartable_syscalls=yes \
--- a/packages/databases/mysql/install
+++ b/packages/databases/mysql/install
@ -23,4 +23,7 @@
 . config/options $1

 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/usr/share/mysql/charsets
+  cp -R $PKG_BUILD/sql/share/charsets/*.xml $INSTALL/usr/share/mysql/charsets
--- a/packages/databases/sqlite/build
+++ b/packages/databases/sqlite/build
@ -37,7 +37,6 @@ cd $PKG_BUILD
            --enable-dynamic-extensions \
            --with-gnu-ld

-
 make

 $STRIP .libs/sqlite3
--- a/packages/graphics/tiff/install
+++ b/packages/graphics/tiff/install
@ -23,4 +23,6 @@
 . config/options $1

 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libtiff/.libs/*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libtiff/.libs/libtiff.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libtiff/.libs/libtiffxx.so* $INSTALL/usr/lib
+    rm -rf $INSTALL/usr/lib/libtiffxx.so*T
--- a/packages/linux/meta
+++ b/packages/linux/meta
@ -19,13 +19,13 @@
 ################################################################################

 PKG_NAME="linux"
-PKG_VERSION="2.6.38-rc8"
+PKG_VERSION="2.6.38"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org"
-#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="busybox linux-drivers linux-firmware"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz"
 PKG_PRIORITY="optional"
@ -36,7 +36,13 @@ PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"

-if [ "$LINUX_NEXT" = "yes" ]; then
-  PKG_VERSION="2.6.38-rc7"
-  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+if [ "$LINUX_NEXT" = "yes" -a "$LINUX" = "default" ]; then
+  PKG_VERSION="2.6.38"
+  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#  PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
+fi
+
+if [ "$LINUX" = "ti-omap4" ]; then
+  PKG_VERSION="2.6.35-ti.980.1r14"
+  PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-000_crosscompile.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-000_crosscompile.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-002-bash-only-feature.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-002-bash-only-feature.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-003-no_dev_console.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-004-lower-undefined-mode-timeout.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-004-lower-undefined-mode-timeout.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-005-kconfig-no-timestamp.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-005-kconfig-no-timestamp.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-006-enable-utf8.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-006-enable-utf8.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-007-die-floppy-die.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-007-die-floppy-die.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-008-014-linux-2.6.35-01-add_lirc_drivers-20100407-0.1.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-008-014-linux-2.6.35-01-add_lirc_drivers-20100407-0.1.patch
--- a/packages/linux/patches/linux-2.6.35-ti.980.1r14-321-linux_fix_SMC_instructions.patch
+++ b/packages/linux/patches/linux-2.6.35-ti.980.1r14-321-linux_fix_SMC_instructions.patch
@ -0,0 +1,22 @@
+diff -Naur linux-2.6.35-980.1release14/arch/arm/mach-omap2/Makefile linux-2.6.35-980.1release14a/arch/arm/mach-omap2/Makefile
+--- linux-2.6.35-980.1release14/arch/arm/mach-omap2/Makefile	2011-01-19 11:27:25.000000000 +0100
+++ linux-2.6.35-980.1release14a/arch/arm/mach-omap2/Makefile	2011-02-27 17:50:38.370778859 +0100
+@@ -29,7 +29,9 @@
+ obj-$(CONFIG_ARCH_OMAP4)		+= omap44xx-smc.o omap4-common.o \
+ 					   omap4-wakeupgen.o
+ 
+-AFLAGS_omap44xx-smc.o			:=-Wa,-march=armv7-a
+plus_sec := $(call as-instr,.arch_extension sec,+sec)
+AFLAGS_omap44xx-smc.o			:=-Wa,-march=armv7-a$(plus_sec)
+AFLAGS_omap-headsmp.o			:=-Wa,-march=armv7-a$(plus_sec)
+ 
+ # Functions loaded to SRAM
+ obj-$(CONFIG_ARCH_OMAP2420)		+= sram242x.o
+@@ -63,6 +65,7 @@
+ 
+ AFLAGS_sleep24xx.o			:=-Wa,-march=armv6
+ AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a
+AFLAGS_sleep44xx.o                   :=-Wa,-march=armv7-a$(plus_sec)
+ 
+ ifeq ($(CONFIG_PM_VERBOSE),y)
+ CFLAGS_pm_bus.o				+= -DDEBUG
--- a/packages/linux/patches/linux-2.6.38-000_crosscompile.patch
+++ b/packages/linux/patches/linux-2.6.38-000_crosscompile.patch
@ -0,0 +1,22 @@
+--- linux-2.6.24-rc2.orig/arch/x86/boot/tools/build.c	2007-10-06 12:26:14.000000000 +0200
+++ linux-2.6.24-rc2/arch/x86/boot/tools/build.c	2007-10-06 12:27:36.000000000 +0200
+@@ -29,7 +29,6 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
+@@ -42,6 +41,11 @@
+ #define DEFAULT_MAJOR_ROOT 0
+ #define DEFAULT_MINOR_ROOT 0
+ 
+#undef major
+#define major(dev) ((int)(((dev) >> 8) & 0xff))
+#undef minor
+#define minor(dev) ((int)((dev) & 0xff))
+
+ /* Minimal number of setup sectors */
+ #define SETUP_SECT_MIN 5
+ #define SETUP_SECT_MAX 64
--- a/packages/linux/patches/linux-2.6.38-002_bash_only_feature.patch
+++ b/packages/linux/patches/linux-2.6.38-002_bash_only_feature.patch
@ -0,0 +1,15 @@
+Index: linux-2.6.16/scripts/gen_initramfs_list.sh
+===================================================================
+--- linux-2.6.16.orig/scripts/gen_initramfs_list.sh	2006-03-20 18:41:34.000000000 +0100
+++ linux-2.6.16/scripts/gen_initramfs_list.sh	2006-03-20 18:42:40.000000000 +0100
+@@ -56,9 +56,7 @@
+ 
+ parse() {
+ 	local location="$1"
+-	local name="${location/${srcdir}//}"
+-	# change '//' into '/'
+-	name="${name//\/\///}"
+	local name="$(echo "$location" | sed -e 's%$srcdir%%' -e 's%//*%/%g')"
+ 	local mode="$2"
+ 	local uid="$3"
+ 	local gid="$4"
--- a/packages/linux/patches/linux-2.6.38-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-2.6.38-003-no_dev_console.patch
@ -0,0 +1,20 @@
+diff -Naur linux-2.6.34-rc7/init/main.c linux-2.6.34-rc7.patch/init/main.c
+--- linux-2.6.34-rc7/init/main.c	2010-05-10 03:36:28.000000000 +0200
+++ linux-2.6.34-rc7.patch/init/main.c	2010-05-15 12:28:34.767241760 +0200
+@@ -886,8 +886,14 @@
+ 	do_basic_setup();
+ 
+ 	/* Open the /dev/console on the rootfs, this should never fail */
+-	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+-		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+	char *console = "/dev_console";
+
+	if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) {
+		sys_mknod(console, S_IFCHR|0600, (TTYAUX_MAJOR<<8)|1);
+		if (sys_open(console, O_RDWR, 0) < 0)
+			printk(KERN_WARNING "Warning: unable to open an initial console.\n");
+		sys_unlink(console);
+	}
+ 
+ 	(void) sys_dup(0);
+ 	(void) sys_dup(0);
--- a/packages/linux/patches/linux-2.6.38-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-2.6.38-004_lower_undefined_mode_timeout.patch
@ -0,0 +1,24 @@
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/tty.c linux-2.6.23-rc9/arch/i386/boot/tty.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/tty.c	2007-10-06 12:26:14.000000000 +0200
+++ linux-2.6.23-rc9/arch/x86/boot/tty.c	2007-10-06 12:37:47.000000000 +0200
+@@ -92,7 +92,7 @@
+ 
+ int getchar_timeout(void)
+ {
+-	int cnt = 30;
+	int cnt = 3;
+ 	int t0, t1;
+ 
+ 	t0 = gettime();
+diff -Naur linux-2.6.23-rc9.orig/arch/i386/boot/video.c linux-2.6.23-rc9/arch/i386/boot/video.c
+--- linux-2.6.23-rc9.orig/arch/x86/boot/video.c	2007-10-06 12:26:14.000000000 +0200
+++ linux-2.6.23-rc9/arch/x86/boot/video.c	2007-10-06 12:36:05.000000000 +0200
+@@ -329,7 +329,7 @@
+ 	unsigned int sel;
+ 
+ 	puts("Press <ENTER> to see video modes available, "
+-	     "<SPACE> to continue, or wait 30 sec\n");
+	     "<SPACE> to continue, or wait 3 sec\n");
+ 
+ 	kbd_flush();
+ 	while (1) {
--- a/packages/linux/patches/linux-2.6.38-005_kconfig_no_timestamp.patch
+++ b/packages/linux/patches/linux-2.6.38-005_kconfig_no_timestamp.patch
@ -0,0 +1,13 @@
+Index: linux-2.6.16/scripts/kconfig/confdata.c
+===================================================================
+--- linux-2.6.16.orig/scripts/kconfig/confdata.c	2006-03-20 06:53:29.000000000 +0100
+++ linux-2.6.16/scripts/kconfig/confdata.c	2006-03-20 18:47:06.000000000 +0100
+@@ -340,7 +340,7 @@
+ 	int type, l;
+ 	const char *str;
+ 	time_t now;
+-	int use_timestamp = 1;
+	int use_timestamp = 0;
+ 	char *env;
+ 
+ 	dirname[0] = 0;
--- a/packages/linux/patches/linux-2.6.38-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-2.6.38-006_enable_utf8.patch
@ -0,0 +1,25 @@
+diff -Naur linux-2.6.31-rc4.orig/fs/fat/inode.c linux-2.6.31-rc4/fs/fat/inode.c
+--- linux-2.6.31-rc4.orig/fs/fat/inode.c	2009-07-25 12:47:41.000000000 +0200
+++ linux-2.6.31-rc4/fs/fat/inode.c	2009-07-25 13:38:18.000000000 +0200
+@@ -979,7 +979,8 @@
+ 	}
+ 	opts->name_check = 'n';
+ 	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
+-	opts->utf8 = opts->unicode_xlate = 0;
+	opts->utf8 = 1;
+	opts->unicode_xlate = 0;
+ 	opts->numtail = 1;
+ 	opts->usefree = opts->nocase = 0;
+ 	opts->tz_utc = 0;
+diff -Naur linux-2.6.31-rc4.orig/fs/isofs/inode.c linux-2.6.31-rc4/fs/isofs/inode.c
+--- linux-2.6.31-rc4.orig/fs/isofs/inode.c	2009-07-25 12:47:41.000000000 +0200
+++ linux-2.6.31-rc4/fs/isofs/inode.c	2009-07-25 13:38:49.000000000 +0200
+@@ -377,7 +377,7 @@
+ 	popt->gid = 0;
+ 	popt->uid = 0;
+ 	popt->iocharset = NULL;
+-	popt->utf8 = 0;
+	popt->utf8 = 1;
+ 	popt->overriderockperm = 0;
+ 	popt->session=-1;
+ 	popt->sbsector=-1;
--- a/packages/linux/patches/linux-2.6.38-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-2.6.38-007_die_floppy_die.patch
@ -0,0 +1,30 @@
+From 4ff58b642f80dedb20533978123d89b5ac9b1ed5 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle@phobos.i.jkkm.org>
+Date: Tue, 30 Mar 2010 00:04:29 -0400
+Subject: die-floppy-die
+
+Kill the floppy.ko pnp modalias. We were surviving just fine without
+autoloading floppy drivers, tyvm.
+
+Please feel free to register all complaints in the wastepaper bin.
+---
+ drivers/block/floppy.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
+index 90c4038..f4a0b90 100644
+--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
+@@ -4619,8 +4619,7 @@ static const struct pnp_device_id floppy_pnpids[] = {
+ 	{"PNP0700", 0},
+ 	{}
+ };
+-
+-MODULE_DEVICE_TABLE(pnp, floppy_pnpids);
+/* MODULE_DEVICE_TABLE(pnp, floppy_pnpids); */
+ 
+ #else
+ 
+-- 
+1.7.0.1
+
--- a/packages/linux/patches/linux-2.6.38-rc8-008-hda_intel_prealloc_4mb_dmabuffer.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-008-hda_intel_prealloc_4mb_dmabuffer.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-009_disable_i8042_check_on_apple_mac.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-050_add_appleir_usb_driver.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-051_add_ite-cir_driver-0.1.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-051_add_ite-cir_driver-0.1.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-052-aureal_remote_quirk-0.1.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-053_ati-remote_all_keys_and_keychange-0.1.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-110-drm_nouveau_upstream-20110312.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-110-drm_nouveau_upstream-20110312.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-716_mm-zero_swappiness.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-716_mm-zero_swappiness.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-054_fix_nuvoton_wakeup-0.1.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-054_fix_nuvoton_wakeup-0.1.patch
@ -1,12 +0,0 @@
-diff -Naur linux-2.6.38-rc6/drivers/media/rc/nuvoton-cir.h linux-2.6.38-rc6.patch/drivers/media/rc/nuvoton-cir.h
--- linux-2.6.38-rc6/drivers/media/rc/nuvoton-cir.h	2011-02-22 02:25:52.000000000 +0100
-+++ linux-2.6.38-rc6.patch/drivers/media/rc/nuvoton-cir.h	2011-02-28 14:26:20.385871213 +0100
-@@ -306,7 +306,7 @@
- #define CIR_WAKE_IRFIFOSTS_RX_FULL	0x10
- 
- /* CIR Wake FIFO buffer is 67 bytes long */
-#define CIR_WAKE_FIFO_LEN		67
-+#define CIR_WAKE_FIFO_LEN		65
- /* CIR Wake byte comparison tolerance */
- #define CIR_WAKE_CMP_TOLERANCE		5
- 
--- a/packages/linux/patches/linux-2.6.38-rc8-300-linux_omap_dss2_20110309.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-300-linux_omap_dss2_20110309.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-301-V5_Add_display_type_HDMI_to_DSS2.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-301-V5_Add_display_type_HDMI_to_DSS2.patch
@ -1,123 +0,0 @@
-Adding HDMI type in dss_features , overlay and
-the manager so that HDMI type of display will be recognized.
-
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- arch/arm/plat-omap/include/plat/display.h |    1 +
- drivers/video/omap2/dss/display.c         |    2 ++
- drivers/video/omap2/dss/dss_features.c    |    2 +-
- drivers/video/omap2/dss/manager.c         |    9 +++++++--
- drivers/video/omap2/dss/overlay.c         |    6 ++++--
- 5 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
-index e81ca66..5e04ddc 100644
--- a/arch/arm/plat-omap/include/plat/display.h
-+++ b/arch/arm/plat-omap/include/plat/display.h
-@@ -58,6 +58,7 @@ enum omap_display_type {
- 	OMAP_DISPLAY_TYPE_SDI		= 1 << 2,
- 	OMAP_DISPLAY_TYPE_DSI		= 1 << 3,
- 	OMAP_DISPLAY_TYPE_VENC		= 1 << 4,
-+	OMAP_DISPLAY_TYPE_HDMI		= 1 << 5,
- };
- 
- enum omap_plane {
-diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
-index 7d96b72..c40bcbd 100644
--- a/drivers/video/omap2/dss/display.c
-+++ b/drivers/video/omap2/dss/display.c
-@@ -342,6 +342,7 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev)
- 			return 16;
- 	case OMAP_DISPLAY_TYPE_VENC:
- 	case OMAP_DISPLAY_TYPE_SDI:
-+	case OMAP_DISPLAY_TYPE_HDMI:
- 		return 24;
- 	default:
- 		BUG();
-@@ -368,6 +369,7 @@ bool dss_use_replication(struct omap_dss_device *dssdev,
- 	case OMAP_DISPLAY_TYPE_DPI:
- 		bpp = dssdev->phy.dpi.data_lines;
- 		break;
-+	case OMAP_DISPLAY_TYPE_HDMI:
- 	case OMAP_DISPLAY_TYPE_VENC:
- 	case OMAP_DISPLAY_TYPE_SDI:
- 		bpp = 24;
-diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
-index 6eb6ec6..86dc848 100644
--- a/drivers/video/omap2/dss/dss_features.c
-+++ b/drivers/video/omap2/dss/dss_features.c
-@@ -115,7 +115,7 @@ static const enum omap_display_type omap4_dss_supported_displays[] = {
- 	OMAP_DISPLAY_TYPE_DBI | OMAP_DISPLAY_TYPE_DSI,
- 
- 	/* OMAP_DSS_CHANNEL_DIGIT */
-	OMAP_DISPLAY_TYPE_VENC,
-+	OMAP_DISPLAY_TYPE_VENC | OMAP_DISPLAY_TYPE_HDMI,
- 
- 	/* OMAP_DSS_CHANNEL_LCD2 */
- 	OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI |
-diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
-index 1f53bf2..bcd37ec 100644
--- a/drivers/video/omap2/dss/manager.c
-+++ b/drivers/video/omap2/dss/manager.c
-@@ -515,6 +515,8 @@ static int dss_mgr_wait_for_vsync(struct omap_overlay_manager *mgr)
- 
- 	if (mgr->device->type == OMAP_DISPLAY_TYPE_VENC) {
- 		irq = DISPC_IRQ_EVSYNC_ODD;
-+	} else if (mgr->device->type == OMAP_DISPLAY_TYPE_HDMI) {
-+		irq = DISPC_IRQ_EVSYNC_EVEN;
- 	} else {
- 		if (mgr->id == OMAP_DSS_CHANNEL_LCD)
- 			irq = DISPC_IRQ_VSYNC;
-@@ -536,7 +538,8 @@ static int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
- 	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
- 		return 0;
- 
-	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
-+	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
-+			|| dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
- 		irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
- 	} else {
- 		if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-@@ -613,7 +616,8 @@ int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
- 	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
- 		return 0;
- 
-	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
-+	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
-+			|| dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
- 		irq = DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
- 	} else {
- 		if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE) {
-@@ -1377,6 +1381,7 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
- 		case OMAP_DISPLAY_TYPE_DBI:
- 		case OMAP_DISPLAY_TYPE_SDI:
- 		case OMAP_DISPLAY_TYPE_VENC:
-+		case OMAP_DISPLAY_TYPE_HDMI:
- 			default_get_overlay_fifo_thresholds(ovl->id, size,
- 					&oc->burst_size, &oc->fifo_low,
- 					&oc->fifo_high);
-diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
-index 996e9a4..f1aca6d 100644
--- a/drivers/video/omap2/dss/overlay.c
-+++ b/drivers/video/omap2/dss/overlay.c
-@@ -679,7 +679,8 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
- 			lcd2_mgr->set_device(lcd2_mgr, dssdev);
- 			mgr = lcd2_mgr;
- 		}
-	} else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC) {
-+	} else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC
-+			&& dssdev->type != OMAP_DISPLAY_TYPE_HDMI) {
- 		if (!lcd_mgr->device || force) {
- 			if (lcd_mgr->device)
- 				lcd_mgr->unset_device(lcd_mgr);
-@@ -688,7 +689,8 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
- 		}
- 	}
- 
-	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC) {
-+	if (dssdev->type == OMAP_DISPLAY_TYPE_VENC
-+			|| dssdev->type == OMAP_DISPLAY_TYPE_HDMI) {
- 		if (!tv_mgr->device || force) {
- 			if (tv_mgr->device)
- 				tv_mgr->unset_device(tv_mgr);
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-302-V5_Select_between_HDMI_VENC_clock_source.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-302-V5_Select_between_HDMI_VENC_clock_source.patch
@ -1,47 +0,0 @@
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- drivers/video/omap2/dss/dss.c |    5 +++++
- drivers/video/omap2/dss/dss.h |    6 ++++++
- 2 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
-index aed9345..0be83c8 100644
--- a/drivers/video/omap2/dss/dss.c
-+++ b/drivers/video/omap2/dss/dss.c
-@@ -605,6 +605,11 @@ void dss_set_dac_pwrdn_bgz(bool enable)
- 	REG_FLD_MOD(DSS_CONTROL, enable, 5, 5);	/* DAC Power-Down Control */
- }
- 
-+void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select hdmi)
-+{
-+	REG_FLD_MOD(DSS_CONTROL, hdmi, 15, 15);	/* VENC_HDMI_SWITCH */
-+}
-+
- static int dss_init(void)
- {
- 	int r;
-diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
-index b845468..c2c0fcf 100644
--- a/drivers/video/omap2/dss/dss.h
-+++ b/drivers/video/omap2/dss/dss.h
-@@ -132,6 +132,11 @@ struct dss_clk_source_name {
- 	const char *clksrc_name;
- };
- 
-+enum dss_hdmi_venc_clk_source_select {
-+	DSS_VENC_TV_CLK = 0,
-+	DSS_HDMI_M_PCLK = 1,
-+};
-+
- struct dss_clock_info {
- 	/* rates that we get with dividers below */
- 	unsigned long fck;
-@@ -220,6 +225,7 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force);
- int dss_init_platform_driver(void);
- void dss_uninit_platform_driver(void);
- 
-+void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);
- void dss_save_context(void);
- void dss_restore_context(void);
- void dss_clk_enable(enum dss_clock clks);
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-303-V5_Dispc_gamma_enable_set-reset_function_for_TV.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-303-V5_Dispc_gamma_enable_set-reset_function_for_TV.patch
@ -1,46 +0,0 @@
-Adding function to reset/set gamma table bit for TV interface
-currentl only support for disabled is added.
-
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- drivers/video/omap2/dss/dispc.c |   13 +++++++++++++
- drivers/video/omap2/dss/dss.h   |    1 +
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
-index b8c576a..9b86f5f 100644
--- a/drivers/video/omap2/dss/dispc.c
-+++ b/drivers/video/omap2/dss/dispc.c
-@@ -1008,6 +1008,19 @@ void dispc_set_burst_size(enum omap_plane plane,
- 	enable_clocks(0);
- }
- 
-+void dispc_enable_gamma_table(bool enable)
-+{
-+	/* This is partially implemented to support only
-+	 *  disabling of the gamma table.
-+	 */
-+	if (enable) {
-+		DSSWARN("Gamma table enabling for TV not yet supported");
-+		return;
-+	}
-+
-+	REG_FLD_MOD(DISPC_CONFIG, enable, 9, 9);
-+}
-+
- static void _dispc_set_vid_color_conv(enum omap_plane plane, bool enable)
- {
- 	u32 val;
-diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
-index c2c0fcf..9f563a6 100644
--- a/drivers/video/omap2/dss/dss.h
-+++ b/drivers/video/omap2/dss/dss.h
-@@ -376,6 +376,7 @@ void dispc_set_plane_size(enum omap_plane plane, u16 width, u16 height);
- void dispc_set_channel_out(enum omap_plane plane,
- 		enum omap_channel channel_out);
- 
-+void dispc_enable_gamma_table(bool enable);
- int dispc_setup_plane(enum omap_plane plane,
- 		      u32 paddr, u16 screen_width,
- 		      u16 pos_x, u16 pos_y,
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-304-V5_HDMI_driver_header_file_addition.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-304-V5_HDMI_driver_header_file_addition.patch
@ -1,431 +0,0 @@
-Adding the hdmi interface driver header file (hdmi.h) to the dss driver.
-Register and structure declaration done here.
-
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- drivers/video/omap2/dss/hdmi.h |  415 ++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 415 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/omap2/dss/hdmi.h
-
-diff --git a/drivers/video/omap2/dss/hdmi.h b/drivers/video/omap2/dss/hdmi.h
-new file mode 100644
-index 0000000..9887ab9
--- /dev/null
-+++ b/drivers/video/omap2/dss/hdmi.h
-@@ -0,0 +1,415 @@
-+/*
-+ * hdmi.h
-+ *
-+ * HDMI driver definition for TI OMAP4 processors.
-+ *
-+ * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published by
-+ * the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _OMAP4_DSS_HDMI_H_
-+#define _OMAP4_DSS_HDMI_H_
-+
-+#include <linux/string.h>
-+#include <plat/display.h>
-+
-+#define HDMI_WP		0x0
-+#define HDMI_CORE_SYS		0x400
-+#define HDMI_CORE_AV		0x900
-+#define HDMI_PLLCTRL		0x200
-+#define HDMI_PHY		0x300
-+
-+struct hdmi_reg { u16 idx; };
-+
-+#define HDMI_REG(idx)			((const struct hdmi_reg) { idx })
-+
-+/* HDMI Wrapper */
-+#define HDMI_WP_REG(idx)			HDMI_REG(HDMI_WP + idx)
-+
-+#define HDMI_WP_REVISION			HDMI_WP_REG(0x0)
-+#define HDMI_WP_SYSCONFIG			HDMI_WP_REG(0x10)
-+#define HDMI_WP_IRQSTATUS_RAW			HDMI_WP_REG(0x24)
-+#define HDMI_WP_IRQSTATUS			HDMI_WP_REG(0x28)
-+#define HDMI_WP_PWR_CTRL			HDMI_WP_REG(0x40)
-+#define HDMI_WP_IRQENABLE_SET			HDMI_WP_REG(0x2C)
-+#define HDMI_WP_VIDEO_CFG			HDMI_WP_REG(0x50)
-+#define HDMI_WP_VIDEO_SIZE			HDMI_WP_REG(0x60)
-+#define HDMI_WP_VIDEO_TIMING_H			HDMI_WP_REG(0x68)
-+#define HDMI_WP_VIDEO_TIMING_V			HDMI_WP_REG(0x6C)
-+#define HDMI_WP_WP_CLK				HDMI_WP_REG(0x70)
-+
-+/* HDMI IP Core System */
-+#define HDMI_CORE_SYS_REG(idx)			HDMI_REG(HDMI_CORE_SYS + idx)
-+
-+#define HDMI_CORE_SYS_VND_IDL			HDMI_CORE_SYS_REG(0x0)
-+#define HDMI_CORE_SYS_DEV_IDL			HDMI_CORE_SYS_REG(0x8)
-+#define HDMI_CORE_SYS_DEV_IDH			HDMI_CORE_SYS_REG(0xC)
-+#define HDMI_CORE_SYS_DEV_REV			HDMI_CORE_SYS_REG(0x10)
-+#define HDMI_CORE_SYS_SRST			HDMI_CORE_SYS_REG(0x14)
-+#define HDMI_CORE_CTRL1			HDMI_CORE_SYS_REG(0x20)
-+#define HDMI_CORE_SYS_SYS_STAT			HDMI_CORE_SYS_REG(0x24)
-+#define HDMI_CORE_SYS_VID_ACEN			HDMI_CORE_SYS_REG(0x124)
-+#define HDMI_CORE_SYS_VID_MODE			HDMI_CORE_SYS_REG(0x128)
-+#define HDMI_CORE_SYS_INTR_STATE		HDMI_CORE_SYS_REG(0x1C0)
-+#define HDMI_CORE_SYS_INTR1			HDMI_CORE_SYS_REG(0x1C4)
-+#define HDMI_CORE_SYS_INTR2			HDMI_CORE_SYS_REG(0x1C8)
-+#define HDMI_CORE_SYS_INTR3			HDMI_CORE_SYS_REG(0x1CC)
-+#define HDMI_CORE_SYS_INTR4			HDMI_CORE_SYS_REG(0x1D0)
-+#define HDMI_CORE_SYS_UMASK1			HDMI_CORE_SYS_REG(0x1D4)
-+#define HDMI_CORE_SYS_TMDS_CTRL		HDMI_CORE_SYS_REG(0x208)
-+#define HDMI_CORE_SYS_DE_DLY			HDMI_CORE_SYS_REG(0xC8)
-+#define HDMI_CORE_SYS_DE_CTRL			HDMI_CORE_SYS_REG(0xCC)
-+#define HDMI_CORE_SYS_DE_TOP			HDMI_CORE_SYS_REG(0xD0)
-+#define HDMI_CORE_SYS_DE_CNTL			HDMI_CORE_SYS_REG(0xD8)
-+#define HDMI_CORE_SYS_DE_CNTH			HDMI_CORE_SYS_REG(0xDC)
-+#define HDMI_CORE_SYS_DE_LINL			HDMI_CORE_SYS_REG(0xE0)
-+#define HDMI_CORE_SYS_DE_LINH_1		HDMI_CORE_SYS_REG(0xE4)
-+#define HDMI_CORE_CTRL1_VEN_FOLLOWVSYNC	0x1
-+#define HDMI_CORE_CTRL1_HEN_FOLLOWHSYNC	0x1
-+#define HDMI_CORE_CTRL1_BSEL_24BITBUS		0x1
-+#define HDMI_CORE_CTRL1_EDGE_RISINGEDGE	0x1
-+
-+/* HDMI DDC E-DID */
-+#define HDMI_CORE_DDC_CMD			HDMI_CORE_SYS_REG(0x3CC)
-+#define HDMI_CORE_DDC_STATUS			HDMI_CORE_SYS_REG(0x3C8)
-+#define HDMI_CORE_DDC_ADDR			HDMI_CORE_SYS_REG(0x3B4)
-+#define HDMI_CORE_DDC_OFFSET			HDMI_CORE_SYS_REG(0x3BC)
-+#define HDMI_CORE_DDC_COUNT1			HDMI_CORE_SYS_REG(0x3C0)
-+#define HDMI_CORE_DDC_COUNT2			HDMI_CORE_SYS_REG(0x3C4)
-+#define HDMI_CORE_DDC_DATA			HDMI_CORE_SYS_REG(0x3D0)
-+#define HDMI_CORE_DDC_SEGM			HDMI_CORE_SYS_REG(0x3B8)
-+
-+/* HDMI IP Core Audio Video */
-+#define HDMI_CORE_AV_REG(idx)			HDMI_REG(HDMI_CORE_AV + idx)
-+
-+#define HDMI_CORE_AV_HDMI_CTRL			HDMI_CORE_AV_REG(0xBC)
-+#define HDMI_CORE_AV_DPD			HDMI_CORE_AV_REG(0xF4)
-+#define HDMI_CORE_AV_PB_CTRL1			HDMI_CORE_AV_REG(0xF8)
-+#define HDMI_CORE_AV_PB_CTRL2			HDMI_CORE_AV_REG(0xFC)
-+#define HDMI_CORE_AV_AVI_TYPE			HDMI_CORE_AV_REG(0x100)
-+#define HDMI_CORE_AV_AVI_VERS			HDMI_CORE_AV_REG(0x104)
-+#define HDMI_CORE_AV_AVI_LEN			HDMI_CORE_AV_REG(0x108)
-+#define HDMI_CORE_AV_AVI_CHSUM			HDMI_CORE_AV_REG(0x10C)
-+#define HDMI_CORE_AV_AVI_DBYTE(n)		HDMI_CORE_AV_REG(n * 4 + 0x110)
-+#define HDMI_CORE_AV_AVI_DBYTE_NELEMS		HDMI_CORE_AV_REG(15)
-+#define HDMI_CORE_AV_SPD_DBYTE			HDMI_CORE_AV_REG(0x190)
-+#define HDMI_CORE_AV_SPD_DBYTE_NELEMS		HDMI_CORE_AV_REG(27)
-+#define HDMI_CORE_AV_MPEG_DBYTE		HDMI_CORE_AV_REG(0x290)
-+#define HDMI_CORE_AV_MPEG_DBYTE_NELEMS		HDMI_CORE_AV_REG(27)
-+#define HDMI_CORE_AV_GEN_DBYTE			HDMI_CORE_AV_REG(0x300)
-+#define HDMI_CORE_AV_GEN_DBYTE_NELEMS		HDMI_CORE_AV_REG(31)
-+#define HDMI_CORE_AV_GEN2_DBYTE		HDMI_CORE_AV_REG(0x380)
-+#define HDMI_CORE_AV_GEN2_DBYTE_NELEMS		HDMI_CORE_AV_REG(31)
-+#define HDMI_CORE_AV_ACR_CTRL			HDMI_CORE_AV_REG(0x4)
-+#define HDMI_CORE_AV_FREQ_SVAL			HDMI_CORE_AV_REG(0x8)
-+#define HDMI_CORE_AV_N_SVAL1			HDMI_CORE_AV_REG(0xC)
-+#define HDMI_CORE_AV_N_SVAL2			HDMI_CORE_AV_REG(0x10)
-+#define HDMI_CORE_AV_N_SVAL3			HDMI_CORE_AV_REG(0x14)
-+#define HDMI_CORE_AV_CTS_SVAL1			HDMI_CORE_AV_REG(0x18)
-+#define HDMI_CORE_AV_CTS_SVAL2			HDMI_CORE_AV_REG(0x1C)
-+#define HDMI_CORE_AV_CTS_SVAL3			HDMI_CORE_AV_REG(0x20)
-+#define HDMI_CORE_AV_CTS_HVAL1			HDMI_CORE_AV_REG(0x24)
-+#define HDMI_CORE_AV_CTS_HVAL2			HDMI_CORE_AV_REG(0x28)
-+#define HDMI_CORE_AV_CTS_HVAL3			HDMI_CORE_AV_REG(0x2C)
-+#define HDMI_CORE_AV_AUD_MODE			HDMI_CORE_AV_REG(0x50)
-+#define HDMI_CORE_AV_SPDIF_CTRL		HDMI_CORE_AV_REG(0x54)
-+#define HDMI_CORE_AV_HW_SPDIF_FS		HDMI_CORE_AV_REG(0x60)
-+#define HDMI_CORE_AV_SWAP_I2S			HDMI_CORE_AV_REG(0x64)
-+#define HDMI_CORE_AV_SPDIF_ERTH		HDMI_CORE_AV_REG(0x6C)
-+#define HDMI_CORE_AV_I2S_IN_MAP		HDMI_CORE_AV_REG(0x70)
-+#define HDMI_CORE_AV_I2S_IN_CTRL		HDMI_CORE_AV_REG(0x74)
-+#define HDMI_CORE_AV_I2S_CHST0			HDMI_CORE_AV_REG(0x78)
-+#define HDMI_CORE_AV_I2S_CHST1			HDMI_CORE_AV_REG(0x7C)
-+#define HDMI_CORE_AV_I2S_CHST2			HDMI_CORE_AV_REG(0x80)
-+#define HDMI_CORE_AV_I2S_CHST4			HDMI_CORE_AV_REG(0x84)
-+#define HDMI_CORE_AV_I2S_CHST5			HDMI_CORE_AV_REG(0x88)
-+#define HDMI_CORE_AV_ASRC			HDMI_CORE_AV_REG(0x8C)
-+#define HDMI_CORE_AV_I2S_IN_LEN		HDMI_CORE_AV_REG(0x90)
-+#define HDMI_CORE_AV_HDMI_CTRL			HDMI_CORE_AV_REG(0xBC)
-+#define HDMI_CORE_AV_AUDO_TXSTAT		HDMI_CORE_AV_REG(0xC0)
-+#define HDMI_CORE_AV_AUD_PAR_BUSCLK_1		HDMI_CORE_AV_REG(0xCC)
-+#define HDMI_CORE_AV_AUD_PAR_BUSCLK_2		HDMI_CORE_AV_REG(0xD0)
-+#define HDMI_CORE_AV_AUD_PAR_BUSCLK_3		HDMI_CORE_AV_REG(0xD4)
-+#define HDMI_CORE_AV_TEST_TXCTRL		HDMI_CORE_AV_REG(0xF0)
-+#define HDMI_CORE_AV_DPD			HDMI_CORE_AV_REG(0xF4)
-+#define HDMI_CORE_AV_PB_CTRL1			HDMI_CORE_AV_REG(0xF8)
-+#define HDMI_CORE_AV_PB_CTRL2			HDMI_CORE_AV_REG(0xFC)
-+#define HDMI_CORE_AV_AVI_TYPE			HDMI_CORE_AV_REG(0x100)
-+#define HDMI_CORE_AV_AVI_VERS			HDMI_CORE_AV_REG(0x104)
-+#define HDMI_CORE_AV_AVI_LEN			HDMI_CORE_AV_REG(0x108)
-+#define HDMI_CORE_AV_AVI_CHSUM			HDMI_CORE_AV_REG(0x10C)
-+#define HDMI_CORE_AV_SPD_TYPE			HDMI_CORE_AV_REG(0x180)
-+#define HDMI_CORE_AV_SPD_VERS			HDMI_CORE_AV_REG(0x184)
-+#define HDMI_CORE_AV_SPD_LEN			HDMI_CORE_AV_REG(0x188)
-+#define HDMI_CORE_AV_SPD_CHSUM			HDMI_CORE_AV_REG(0x18C)
-+#define HDMI_CORE_AV_MPEG_TYPE			HDMI_CORE_AV_REG(0x280)
-+#define HDMI_CORE_AV_MPEG_VERS			HDMI_CORE_AV_REG(0x284)
-+#define HDMI_CORE_AV_MPEG_LEN			HDMI_CORE_AV_REG(0x288)
-+#define HDMI_CORE_AV_MPEG_CHSUM		HDMI_CORE_AV_REG(0x28C)
-+#define HDMI_CORE_AV_CP_BYTE1			HDMI_CORE_AV_REG(0x37C)
-+#define HDMI_CORE_AV_CEC_ADDR_ID		HDMI_CORE_AV_REG(0x3FC)
-+#define HDMI_CORE_AV_SPD_DBYTE_ELSIZE		0x4
-+#define HDMI_CORE_AV_GEN2_DBYTE_ELSIZE		0x4
-+#define HDMI_CORE_AV_MPEG_DBYTE_ELSIZE		0x4
-+#define HDMI_CORE_AV_GEN_DBYTE_ELSIZE		0x4
-+
-+/* PLL */
-+#define HDMI_PLL_REG(idx)			HDMI_REG(HDMI_PLLCTRL + idx)
-+
-+#define PLLCTRL_PLL_CONTROL			HDMI_PLL_REG(0x0)
-+#define PLLCTRL_PLL_STATUS			HDMI_PLL_REG(0x4)
-+#define PLLCTRL_PLL_GO				HDMI_PLL_REG(0x8)
-+#define PLLCTRL_CFG1				HDMI_PLL_REG(0xC)
-+#define PLLCTRL_CFG2				HDMI_PLL_REG(0x10)
-+#define PLLCTRL_CFG3				HDMI_PLL_REG(0x14)
-+#define PLLCTRL_CFG4				HDMI_PLL_REG(0x20)
-+
-+/* HDMI PHY */
-+#define HDMI_PHY_REG(idx)			HDMI_REG(HDMI_PHY + idx)
-+
-+#define HDMI_TXPHY_TX_CTRL			HDMI_PHY_REG(0x0)
-+#define HDMI_TXPHY_DIGITAL_CTRL		HDMI_PHY_REG(0x4)
-+#define HDMI_TXPHY_POWER_CTRL			HDMI_PHY_REG(0x8)
-+#define HDMI_TXPHY_PAD_CFG_CTRL		HDMI_PHY_REG(0xC)
-+
-+/* HDMI EDID Length  */
-+#define HDMI_EDID_MAX_LENGTH			256
-+#define EDID_TIMING_DESCRIPTOR_SIZE		0x12
-+#define EDID_DESCRIPTOR_BLOCK0_ADDRESS		0x36
-+#define EDID_DESCRIPTOR_BLOCK1_ADDRESS		0x80
-+#define EDID_SIZE_BLOCK0_TIMING_DESCRIPTOR	4
-+#define EDID_SIZE_BLOCK1_TIMING_DESCRIPTOR	4
-+
-+#define OMAP_HDMI_TIMINGS_NB			34
-+
-+#define REG_FLD_MOD(idx, val, start, end) \
-+	hdmi_write_reg(idx, FLD_MOD(hdmi_read_reg(idx), val, start, end))
-+#define REG_GET(idx, start, end) \
-+	FLD_GET(hdmi_read_reg(idx), start, end)
-+
-+/* HDMI timing structure */
-+struct hdmi_timings {
-+	struct omap_video_timings timings;
-+	int vsync_pol;
-+	int hsync_pol;
-+};
-+
-+enum hdmi_phy_pwr {
-+	HDMI_PHYPWRCMD_OFF = 0,
-+	HDMI_PHYPWRCMD_LDOON = 1,
-+	HDMI_PHYPWRCMD_TXON = 2
-+};
-+
-+enum hdmi_pll_pwr {
-+	HDMI_PLLPWRCMD_ALLOFF = 0,
-+	HDMI_PLLPWRCMD_PLLONLY = 1,
-+	HDMI_PLLPWRCMD_BOTHON_ALLCLKS = 2,
-+	HDMI_PLLPWRCMD_BOTHON_NOPHYCLK = 3
-+};
-+
-+enum hdmi_clk_refsel {
-+	HDMI_REFSEL_PCLK = 0,
-+	HDMI_REFSEL_REF1 = 1,
-+	HDMI_REFSEL_REF2 = 2,
-+	HDMI_REFSEL_SYSCLK = 3
-+};
-+
-+enum hdmi_core_inputbus_width {
-+	HDMI_INPUT_8BIT = 0,
-+	HDMI_INPUT_10BIT = 1,
-+	HDMI_INPUT_12BIT = 2
-+};
-+
-+enum hdmi_core_dither_trunc {
-+	HDMI_OUTPUTTRUNCATION_8BIT = 0,
-+	HDMI_OUTPUTTRUNCATION_10BIT = 1,
-+	HDMI_OUTPUTTRUNCATION_12BIT = 2,
-+	HDMI_OUTPUTDITHER_8BIT = 3,
-+	HDMI_OUTPUTDITHER_10BIT = 4,
-+	HDMI_OUTPUTDITHER_12BIT = 5
-+};
-+
-+enum hdmi_core_deepcolor_ed {
-+	HDMI_DEEPCOLORPACKECTDISABLE = 0,
-+	HDMI_DEEPCOLORPACKECTENABLE = 1
-+};
-+
-+enum hdmi_core_packet_mode {
-+	HDMI_PACKETMODERESERVEDVALUE = 0,
-+	HDMI_PACKETMODE24BITPERPIXEL = 4,
-+	HDMI_PACKETMODE30BITPERPIXEL = 5,
-+	HDMI_PACKETMODE36BITPERPIXEL = 6,
-+	HDMI_PACKETMODE48BITPERPIXEL = 7
-+};
-+
-+enum hdmi_core_hdmi_dvi {
-+	HDMI_DVI = 0,
-+	HDMI_HDMI = 1
-+};
-+
-+enum hdmi_core_tclkselclkmult {
-+	HDMI_FPLL05IDCK = 0,
-+	HDMI_FPLL10IDCK = 1,
-+	HDMI_FPLL20IDCK = 2,
-+	HDMI_FPLL40IDCK = 3
-+};
-+
-+enum hdmi_core_packet_ctrl {
-+	HDMI_PACKETENABLE = 1,
-+	HDMI_PACKETDISABLE = 0,
-+	HDMI_PACKETREPEATON = 1,
-+	HDMI_PACKETREPEATOFF = 0
-+};
-+
-+/* INFOFRAME_AVI_ definitions */
-+enum hdmi_core_infoframe {
-+	HDMI_INFOFRAME_AVI_DB1Y_RGB = 0,
-+	HDMI_INFOFRAME_AVI_DB1Y_YUV422 = 1,
-+	HDMI_INFOFRAME_AVI_DB1Y_YUV444 = 2,
-+	HDMI_INFOFRAME_AVI_DB1A_ACTIVE_FORMAT_OFF = 0,
-+	HDMI_INFOFRAME_AVI_DB1A_ACTIVE_FORMAT_ON =  1,
-+	HDMI_INFOFRAME_AVI_DB1B_NO = 0,
-+	HDMI_INFOFRAME_AVI_DB1B_VERT = 1,
-+	HDMI_INFOFRAME_AVI_DB1B_HORI = 2,
-+	HDMI_INFOFRAME_AVI_DB1B_VERTHORI = 3,
-+	HDMI_INFOFRAME_AVI_DB1S_0 = 0,
-+	HDMI_INFOFRAME_AVI_DB1S_1 = 1,
-+	HDMI_INFOFRAME_AVI_DB1S_2 = 2,
-+	HDMI_INFOFRAME_AVI_DB2C_NO = 0,
-+	HDMI_INFOFRAME_AVI_DB2C_ITU601 = 1,
-+	HDMI_INFOFRAME_AVI_DB2C_ITU709 = 2,
-+	HDMI_INFOFRAME_AVI_DB2C_EC_EXTENDED = 3,
-+	HDMI_INFOFRAME_AVI_DB2M_NO = 0,
-+	HDMI_INFOFRAME_AVI_DB2M_43 = 1,
-+	HDMI_INFOFRAME_AVI_DB2M_169 = 2,
-+	HDMI_INFOFRAME_AVI_DB2R_SAME = 8,
-+	HDMI_INFOFRAME_AVI_DB2R_43 = 9,
-+	HDMI_INFOFRAME_AVI_DB2R_169 = 10,
-+	HDMI_INFOFRAME_AVI_DB2R_149 = 11,
-+	HDMI_INFOFRAME_AVI_DB3ITC_NO = 0,
-+	HDMI_INFOFRAME_AVI_DB3ITC_YES = 1,
-+	HDMI_INFOFRAME_AVI_DB3EC_XVYUV601 = 0,
-+	HDMI_INFOFRAME_AVI_DB3EC_XVYUV709 = 1,
-+	HDMI_INFOFRAME_AVI_DB3Q_DEFAULT = 0,
-+	HDMI_INFOFRAME_AVI_DB3Q_LR = 1,
-+	HDMI_INFOFRAME_AVI_DB3Q_FR = 2,
-+	HDMI_INFOFRAME_AVI_DB3SC_NO = 0,
-+	HDMI_INFOFRAME_AVI_DB3SC_HORI = 1,
-+	HDMI_INFOFRAME_AVI_DB3SC_VERT = 2,
-+	HDMI_INFOFRAME_AVI_DB3SC_HORIVERT = 3,
-+	HDMI_INFOFRAME_AVI_DB5PR_NO = 0,
-+	HDMI_INFOFRAME_AVI_DB5PR_2 = 1,
-+	HDMI_INFOFRAME_AVI_DB5PR_3 = 2,
-+	HDMI_INFOFRAME_AVI_DB5PR_4 = 3,
-+	HDMI_INFOFRAME_AVI_DB5PR_5 = 4,
-+	HDMI_INFOFRAME_AVI_DB5PR_6 = 5,
-+	HDMI_INFOFRAME_AVI_DB5PR_7 = 6,
-+	HDMI_INFOFRAME_AVI_DB5PR_8 = 7,
-+	HDMI_INFOFRAME_AVI_DB5PR_9 = 8,
-+	HDMI_INFOFRAME_AVI_DB5PR_10 = 9
-+};
-+
-+enum hdmi_packing_mode {
-+	HDMI_PACK_10b_RGB_YUV444 = 0,
-+	HDMI_PACK_24b_RGB_YUV444_YUV422 = 1,
-+	HDMI_PACK_20b_YUV422 = 2,
-+	HDMI_PACK_ALREADYPACKED = 7
-+};
-+
-+struct hdmi_core_video_config {
-+	enum hdmi_core_inputbus_width	ip_bus_width;
-+	enum hdmi_core_dither_trunc	op_dither_truc;
-+	enum hdmi_core_deepcolor_ed	deep_color_pkt;
-+	enum hdmi_core_packet_mode	pkt_mode;
-+	enum hdmi_core_hdmi_dvi		hdmi_dvi;
-+	enum hdmi_core_tclkselclkmult	tclk_sel_clkmult;
-+};
-+
-+/*
-+ * Refer to section 8.2 in HDMI 1.3 specification for
-+ * details about infoframe databytes
-+ */
-+struct hdmi_core_infoframe_avi {
-+	u8	db1_format;
-+		/* Y0, Y1 rgb,yCbCr */
-+	u8	db1_active_info;
-+		/* A0  Active information Present */
-+	u8	db1_bar_info_dv;
-+		/* B0, B1 Bar info data valid */
-+	u8	db1_scan_info;
-+		/* S0, S1 scan information */
-+	u8	db2_colorimetry;
-+		/* C0, C1 colorimetry */
-+	u8	db2_aspect_ratio;
-+		/* M0, M1 Aspect ratio (4:3, 16:9) */
-+	u8	db2_active_fmt_ar;
-+		/* R0...R3 Active format aspect ratio */
-+	u8	db3_itc;
-+		/* ITC IT content. */
-+	u8	db3_ec;
-+		/* EC0, EC1, EC2 Extended colorimetry */
-+	u8	db3_q_range;
-+		/* Q1, Q0 Quantization range */
-+	u8	db3_nup_scaling;
-+		/* SC1, SC0 Non-uniform picture scaling */
-+	u8	db4_videocode;
-+		/* VIC0..6 Video format identification */
-+	u8	db5_pixel_repeat;
-+		/* PR0..PR3 Pixel repetition factor */
-+	u16	db6_7_line_eoftop;
-+		/* Line number end of top bar */
-+	u16	db8_9_line_sofbottom;
-+		/* Line number start of bottom bar */
-+	u16	db10_11_pixel_eofleft;
-+		/* Pixel number end of left bar */
-+	u16	db12_13_pixel_sofright;
-+		/* Pixel number start of right bar */
-+};
-+
-+struct hdmi_core_packet_enable_repeat {
-+	u32	audio_pkt;
-+	u32	audio_pkt_repeat;
-+	u32	avi_infoframe;
-+	u32	avi_infoframe_repeat;
-+	u32	gen_cntrl_pkt;
-+	u32	gen_cntrl_pkt_repeat;
-+	u32	generic_pkt;
-+	u32	generic_pkt_repeat;
-+};
-+
-+struct hdmi_video_format {
-+	enum hdmi_packing_mode	packing_mode;
-+	u32			y_res;	/* Line per panel */
-+	u32			x_res;	/* pixel per line */
-+};
-+
-+struct hdmi_video_interface {
-+	int	vsp;	/* Vsync polarity */
-+	int	hsp;	/* Hsync polarity */
-+	int	interlacing;
-+	int	tm;	/* Timing mode */
-+};
-+
-+struct hdmi_cm {
-+	int	code;
-+	int	mode;
-+};
-+
-+struct hdmi_config {
-+	struct hdmi_timings timings;
-+	u16	interlace;
-+	struct hdmi_cm cm;
-+};
-+
-+#endif
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-305-V5_HDMI_driver_addition_in_the_DSS.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-305-V5_HDMI_driver_addition_in_the_DSS.patch
--- a/packages/linux/patches/linux-2.6.38-rc8-306-V5_HDMI_panel_driver_addition_in_the_DSS.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-306-V5_HDMI_panel_driver_addition_in_the_DSS.patch
@ -1,252 +0,0 @@
-The panel driver(hdmi_omap4_panel.c) in omap2/dss acts as a controller
-to manage the enable and disable requests and synchronize audio and video.
-
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- drivers/video/omap2/dss/dss.h              |    2 +
- drivers/video/omap2/dss/hdmi_omap4_panel.c |  222 ++++++++++++++++++++++++++++
- 2 files changed, 224 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/omap2/dss/hdmi_omap4_panel.c
-
-diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
-index 6bf923c..05ccd00 100644
--- a/drivers/video/omap2/dss/dss.h
-+++ b/drivers/video/omap2/dss/dss.h
-@@ -483,6 +483,8 @@ void omapdss_hdmi_display_disable(struct omap_dss_device *dssdev);
- void omapdss_hdmi_display_set_timing(struct omap_dss_device *dssdev);
- int omapdss_hdmi_display_check_timing(struct omap_dss_device *dssdev,
- 					struct omap_video_timings *timings);
-+int hdmi_panel_init(void);
-+void hdmi_panel_exit(void);
- 
- /* RFBI */
- #ifdef CONFIG_OMAP2_DSS_RFBI
-diff --git a/drivers/video/omap2/dss/hdmi_omap4_panel.c b/drivers/video/omap2/dss/hdmi_omap4_panel.c
-new file mode 100644
-index 0000000..ffb5de9
--- /dev/null
-+++ b/drivers/video/omap2/dss/hdmi_omap4_panel.c
-@@ -0,0 +1,222 @@
-+/*
-+ * hdmi_omap4_panel.c
-+ *
-+ * HDMI library support functions for TI OMAP4 processors.
-+ *
-+ * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
-+ * Authors:	Mythri P k <mythripk@ti.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published by
-+ * the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/mutex.h>
-+#include <linux/module.h>
-+#include <plat/display.h>
-+
-+#include "dss.h"
-+
-+static struct {
-+	struct mutex hdmi_lock;
-+} hdmi;
-+
-+
-+static int hdmi_panel_probe(struct omap_dss_device *dssdev)
-+{
-+	DSSDBG("ENTER hdmi_panel_probe\n");
-+
-+	dssdev->panel.config = OMAP_DSS_LCD_TFT |
-+			OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS;
-+
-+	/*
-+	 * Initialize the timings to 640 * 480
-+	 * This is only for framebuffer update not for TV timing setting
-+	 * Setting TV timing will be done only on enable
-+	 */
-+	dssdev->panel.timings.x_res = 640;
-+	dssdev->panel.timings.y_res = 480;
-+
-+	DSSDBG("hdmi_panel_probe x_res= %d y_res = %d\n",
-+		dssdev->panel.timings.x_res,
-+		dssdev->panel.timings.y_res);
-+	return 0;
-+}
-+
-+static void hdmi_panel_remove(struct omap_dss_device *dssdev)
-+{
-+
-+}
-+
-+static int hdmi_panel_enable(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+	DSSDBG("ENTER hdmi_panel_enable\n");
-+
-+	mutex_lock(&hdmi.hdmi_lock);
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	r = omapdss_hdmi_display_enable(dssdev);
-+	if (r) {
-+		DSSERR("failed to power on\n");
-+		goto err;
-+	}
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+err:
-+	mutex_unlock(&hdmi.hdmi_lock);
-+
-+	return r;
-+}
-+
-+static void hdmi_panel_disable(struct omap_dss_device *dssdev)
-+{
-+	mutex_lock(&hdmi.hdmi_lock);
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
-+		omapdss_hdmi_display_disable(dssdev);
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-+
-+	mutex_unlock(&hdmi.hdmi_lock);
-+}
-+
-+static int hdmi_panel_suspend(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	mutex_lock(&hdmi.hdmi_lock);
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-+
-+	omapdss_hdmi_display_disable(dssdev);
-+
-+err:
-+	mutex_unlock(&hdmi.hdmi_lock);
-+
-+	return r;
-+}
-+
-+static int hdmi_panel_resume(struct omap_dss_device *dssdev)
-+{
-+	int r = 0;
-+
-+	mutex_lock(&hdmi.hdmi_lock);
-+
-+	if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
-+		r = -EINVAL;
-+		goto err;
-+	}
-+
-+	r = omapdss_hdmi_display_enable(dssdev);
-+	if (r) {
-+		DSSERR("failed to power on\n");
-+		goto err;
-+	}
-+
-+	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-+
-+err:
-+	mutex_unlock(&hdmi.hdmi_lock);
-+
-+	return r;
-+}
-+
-+static void hdmi_get_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	mutex_lock(&hdmi.hdmi_lock);
-+
-+	*timings = dssdev->panel.timings;
-+
-+	mutex_unlock(&hdmi.hdmi_lock);
-+}
-+
-+static void hdmi_set_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	DSSDBG("hdmi_set_timings\n");
-+
-+	mutex_lock(&hdmi.hdmi_lock);
-+
-+	dssdev->panel.timings = *timings;
-+
-+	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
-+		/* turn the hdmi off and on to get new timings to use */
-+		omapdss_hdmi_display_disable(dssdev);
-+		omapdss_hdmi_display_set_timing(dssdev);
-+	}
-+
-+	mutex_unlock(&hdmi.hdmi_lock);
-+}
-+
-+static int hdmi_check_timings(struct omap_dss_device *dssdev,
-+			struct omap_video_timings *timings)
-+{
-+	int r = 0;
-+
-+	DSSDBG("hdmi_check_timings\n");
-+
-+	mutex_lock(&hdmi.hdmi_lock);
-+
-+	r = omapdss_hdmi_display_check_timing(dssdev, timings);
-+	if (r) {
-+		DSSERR("Timing cannot be applied\n");
-+		goto err;
-+	}
-+err:
-+	mutex_unlock(&hdmi.hdmi_lock);
-+	return r;
-+}
-+
-+static struct omap_dss_driver hdmi_driver = {
-+	.probe		= hdmi_panel_probe,
-+	.remove		= hdmi_panel_remove,
-+	.enable		= hdmi_panel_enable,
-+	.disable	= hdmi_panel_disable,
-+	.suspend	= hdmi_panel_suspend,
-+	.resume		= hdmi_panel_resume,
-+	.get_timings	= hdmi_get_timings,
-+	.set_timings	= hdmi_set_timings,
-+	.check_timings	= hdmi_check_timings,
-+	.driver			= {
-+		.name   = "hdmi_panel",
-+		.owner  = THIS_MODULE,
-+	},
-+};
-+
-+int hdmi_panel_init(void)
-+{
-+	mutex_init(&hdmi.hdmi_lock);
-+
-+	omap_dss_register_driver(&hdmi_driver);
-+
-+	return 0;
-+}
-+
-+void hdmi_panel_exit(void)
-+{
-+	omap_dss_unregister_driver(&hdmi_driver);
-+
-+}
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-307-V5_Add_makefile_and_kconfig_changes_to_enable_HDMI_in_OMAP4.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-307-V5_Add_makefile_and_kconfig_changes_to_enable_HDMI_in_OMAP4.patch
@ -1,36 +0,0 @@
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- drivers/video/omap2/dss/Kconfig  |    8 ++++++++
- drivers/video/omap2/dss/Makefile |    2 ++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig
-index db01473..bfc5da0 100644
--- a/drivers/video/omap2/dss/Kconfig
-+++ b/drivers/video/omap2/dss/Kconfig
-@@ -60,6 +60,14 @@ config OMAP2_DSS_VENC
- 	help
- 	  OMAP Video Encoder support for S-Video and composite TV-out.
- 
-+config OMAP4_DSS_HDMI
-+	bool "HDMI support"
-+	depends on ARCH_OMAP4
-+        default y
-+	help
-+	  HDMI Interface. This adds the High Definition Multimedia Interface.
-+	  See http://www.hdmi.org/ for HDMI specification.
-+
- config OMAP2_DSS_SDI
- 	bool "SDI support"
- 	depends on ARCH_OMAP3
-diff --git a/drivers/video/omap2/dss/Makefile b/drivers/video/omap2/dss/Makefile
-index 7db17b5..10d9d3b 100644
--- a/drivers/video/omap2/dss/Makefile
-+++ b/drivers/video/omap2/dss/Makefile
-@@ -5,3 +5,5 @@ omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o
- omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
- omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
- omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
-+omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi.o \
-+				    hdmi_omap4_panel.o
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-308-V5_Call_to_HDMI_module_init_to_register_driver.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-308-V5_Call_to_HDMI_module_init_to_register_driver.patch
@ -1,43 +0,0 @@
-calling the platform registration of HDMI driver from core
-during initialization.
-
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- drivers/video/omap2/dss/core.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
-index c2f930b..1aa2ed1 100644
--- a/drivers/video/omap2/dss/core.c
-+++ b/drivers/video/omap2/dss/core.c
-@@ -209,6 +209,12 @@ static int omap_dss_probe(struct platform_device *pdev)
- 		goto err_dsi;
- 	}
- 
-+	r = hdmi_init_platform_driver();
-+	if (r) {
-+		DSSERR("Failed to initialize hdmi\n");
-+		goto err_hdmi;
-+	}
-+
- 	r = dss_initialize_debugfs();
- 	if (r)
- 		goto err_debugfs;
-@@ -238,6 +244,8 @@ static int omap_dss_probe(struct platform_device *pdev)
- err_register:
- 	dss_uninitialize_debugfs();
- err_debugfs:
-+	hdmi_uninit_platform_driver();
-+err_hdmi:
- 	dsi_uninit_platform_driver();
- err_dsi:
- 	venc_uninit_platform_driver();
-@@ -263,6 +271,7 @@ static int omap_dss_remove(struct platform_device *pdev)
- 	dispc_uninit_platform_driver();
- 	rfbi_uninit_platform_driver();
- 	dsi_uninit_platform_driver();
-+	hdmi_uninit_platform_driver();
- 	dss_uninit_platform_driver();
- 
- 	dss_uninit_overlays(pdev);
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-309-V5_Add_HDMI_structure_in_the_board_file_for_OMAP4_SDP.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-309-V5_Add_HDMI_structure_in_the_board_file_for_OMAP4_SDP.patch
@ -1,118 +0,0 @@
-Adding  board file structure for display which adds the display
-structure with HDMI as the default driver when the display init
-is called.
-HDMI GPIO configurations are also done in this file.
-
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- arch/arm/mach-omap2/board-4430sdp.c |   75 +++++++++++++++++++++++++++++++++++
- 1 files changed, 75 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
-index 85805d4..f5fcc5f 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
-+++ b/arch/arm/mach-omap2/board-4430sdp.c
-@@ -36,6 +36,7 @@
- #include <plat/usb.h>
- #include <plat/mmc.h>
- #include <plat/omap4-keypad.h>
-+#include <plat/display.h>
- 
- #include "mux.h"
- #include "hsmmc.h"
-@@ -47,6 +48,8 @@
- #define ETH_KS8851_QUART		138
- #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO	184
- #define OMAP4_SFH7741_ENABLE_GPIO		188
-+#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
-+#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
- 
- static const int sdp4430_keymap[] = {
- 	KEY(0, 0, KEY_E),
-@@ -620,6 +623,76 @@ static void __init omap_sfh7741prox_init(void)
- 	}
- }
- 
-+static void sdp4430_hdmi_mux_init(void)
-+{
-+	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-+	omap_mux_init_signal("hdmi_hpd",
-+			OMAP_PIN_INPUT_PULLUP);
-+	omap_mux_init_signal("hdmi_cec",
-+			OMAP_PIN_INPUT_PULLUP);
-+	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
-+	omap_mux_init_signal("hdmi_ddc_scl",
-+			OMAP_PIN_INPUT_PULLUP);
-+	omap_mux_init_signal("hdmi_ddc_sda",
-+			OMAP_PIN_INPUT_PULLUP);
-+}
-+
-+static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
-+{
-+	int status;
-+
-+	status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH,
-+							"hdmi_gpio_hpd");
-+	if (status) {
-+		pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD);
-+		return status;
-+	}
-+	status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,
-+							"hdmi_gpio_ls_oe");
-+	if (status) {
-+		pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);
-+		goto error1;
-+	}
-+
-+	return 0;
-+
-+error1:
-+	gpio_free(HDMI_GPIO_HPD);
-+
-+	return status;
-+}
-+
-+static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
-+{
-+	gpio_free(HDMI_GPIO_LS_OE);
-+	gpio_free(HDMI_GPIO_HPD);
-+}
-+
-+static struct omap_dss_device sdp4430_hdmi_device = {
-+	.name = "hdmi",
-+	.driver_name = "hdmi_panel",
-+	.type = OMAP_DISPLAY_TYPE_HDMI,
-+	.platform_enable = sdp4430_panel_enable_hdmi,
-+	.platform_disable = sdp4430_panel_disable_hdmi,
-+	.channel = OMAP_DSS_CHANNEL_DIGIT,
-+};
-+
-+static struct omap_dss_device *sdp4430_dss_devices[] = {
-+	&sdp4430_hdmi_device,
-+};
-+
-+static struct omap_dss_board_info sdp4430_dss_data = {
-+	.num_devices	= ARRAY_SIZE(sdp4430_dss_devices),
-+	.devices	= sdp4430_dss_devices,
-+	.default_device	= &sdp4430_hdmi_device,
-+};
-+
-+void omap_4430sdp_display_init(void)
-+{
-+	sdp4430_hdmi_mux_init();
-+	omap_display_init(&sdp4430_dss_data);
-+}
-+
- #ifdef CONFIG_OMAP_MUX
- static struct omap_board_mux board_mux[] __initdata = {
- 	OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
-@@ -661,6 +734,8 @@ static void __init omap_4430sdp_init(void)
- 	status = omap4_keyboard_init(&sdp4430_keypad_data);
- 	if (status)
- 		pr_err("Keypad initialization failed: %d\n", status);
-+
-+	omap_4430sdp_display_init();
- }
- 
- static void __init omap_4430sdp_map_io(void)
-- 1.5.6.3 
--- a/packages/linux/patches/linux-2.6.38-rc8-310-V5_Add_HDMI_structure_in_the_board_file_for_OMAP4__PANDA.patch
+++ b/packages/linux/patches/linux-2.6.38-rc8-310-V5_Add_HDMI_structure_in_the_board_file_for_OMAP4__PANDA.patch
@ -1,117 +0,0 @@
-Adding  board file structure for display which adds the display
-structure with HDMI as the default driver when the display init
-is called.
-HDMI GPIO configurations are also done in this file.
-
-Signed-off-by: Mythri P K <mythripk@ti.com>
---
- arch/arm/mach-omap2/board-omap4panda.c |   74 ++++++++++++++++++++++++++++++++
- 1 files changed, 74 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
-index a94ce07..4869c0f 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
-+++ b/arch/arm/mach-omap2/board-omap4panda.c
-@@ -34,6 +34,7 @@
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-+#include <plat/display.h>
- 
- #include <plat/board.h>
- #include <plat/common.h>
-@@ -49,6 +50,8 @@
- #define GPIO_HUB_NRESET		62
- #define GPIO_WIFI_PMENA		43
- #define GPIO_WIFI_IRQ		53
-+#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
-+#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
- 
- /* wl127x BT, FM, GPS connectivity chip */
- static int wl1271_gpios[] = {46, -1, -1};
-@@ -467,6 +470,76 @@ static struct omap_board_mux board_mux[] __initdata = {
- #define board_mux	NULL
- #endif
- 
-+static void sdp4430_hdmi_mux_init(void)
-+{
-+	/* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
-+	omap_mux_init_signal("hdmi_hpd",
-+			OMAP_PIN_INPUT_PULLUP);
-+	omap_mux_init_signal("hdmi_cec",
-+			OMAP_PIN_INPUT_PULLUP);
-+	/* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
-+	omap_mux_init_signal("hdmi_ddc_scl",
-+			OMAP_PIN_INPUT_PULLUP);
-+	omap_mux_init_signal("hdmi_ddc_sda",
-+			OMAP_PIN_INPUT_PULLUP);
-+}
-+
-+static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
-+{
-+	int status;
-+
-+	status = gpio_request_one(HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH,
-+							"hdmi_gpio_hpd");
-+	if (status) {
-+		pr_err("Cannot request GPIO %d\n", HDMI_GPIO_HPD);
-+		return status;
-+	}
-+	status = gpio_request_one(HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH,
-+							"hdmi_gpio_ls_oe");
-+	if (status) {
-+		pr_err("Cannot request GPIO %d\n", HDMI_GPIO_LS_OE);
-+		goto error1;
-+	}
-+
-+	return 0;
-+
-+error1:
-+	gpio_free(HDMI_GPIO_HPD);
-+
-+	return status;
-+}
-+
-+static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
-+{
-+	gpio_free(HDMI_GPIO_LS_OE);
-+	gpio_free(HDMI_GPIO_HPD);
-+}
-+
-+static struct omap_dss_device sdp4430_hdmi_device = {
-+	.name = "hdmi",
-+	.driver_name = "hdmi_panel",
-+	.type = OMAP_DISPLAY_TYPE_HDMI,
-+	.platform_enable = sdp4430_panel_enable_hdmi,
-+	.platform_disable = sdp4430_panel_disable_hdmi,
-+	.channel = OMAP_DSS_CHANNEL_DIGIT,
-+};
-+
-+static struct omap_dss_device *sdp4430_dss_devices[] = {
-+	&sdp4430_hdmi_device,
-+};
-+
-+static struct omap_dss_board_info sdp4430_dss_data = {
-+	.num_devices	= ARRAY_SIZE(sdp4430_dss_devices),
-+	.devices	= sdp4430_dss_devices,
-+	.default_device	= &sdp4430_hdmi_device,
-+};
-+
-+void omap_panda_display_init(void)
-+{
-+	sdp4430_hdmi_mux_init();
-+	omap_display_init(&sdp4430_dss_data);
-+}
-+
- static void __init omap4_panda_init(void)
- {
- 	int package = OMAP_PACKAGE_CBS;
-@@ -485,6 +558,7 @@ static void __init omap4_panda_init(void)
- 	omap4_twl6030_hsmmc_init(mmc);
- 	omap4_ehci_init();
- 	usb_musb_init(&musb_board_data);
-+	omap_panda_display_init();
- }
- 
- static void __init omap4_panda_map_io(void)
-- 1.5.6.3 
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@ -19,13 +19,13 @@
 ################################################################################

 PKG_NAME="connman"
-PKG_VERSION="3634185"
+PKG_VERSION="0.71"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
-#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus"
 PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
 PKG_PRIORITY="optional"
--- a/packages/network/samba/config/smb.conf
+++ b/packages/network/samba/config/smb.conf
@ -126,6 +126,14 @@
  writable = yes
  root preexec = mkdir -p /storage/screenshots

+[Media]
+  path = /media
+  available = yes
+  browsable = yes
+  public = yes
+  writable = yes
+  root preexec = mkdir -p /media
+
 [Logfiles]
  path = /storage/logfiles
  available = yes
--- a/packages/other/enca/install
+++ b/packages/other/enca/install
@ -23,5 +23,5 @@
 . config/options $1

 mkdir -p $INSTALL/usr/lib
-  cp $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib

--- a/packages/security/gnutls/install
+++ b/packages/security/gnutls/install
@ -23,5 +23,10 @@
 . config/options

 mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libextra/.libs/*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/.libs/libgnutls.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/.libs/libgnutlsxx.so* $INSTALL/usr/lib
+    rm -rf $INSTALL/usr/lib/libgnutlsxx.so*T
+  cp -P $PKG_BUILD/libextra/.libs/libgnutls-extra.so* $INSTALL/usr/lib
+    rm -rf $INSTALL/usr/lib/libgnutls-extra.so*T
+  cp -P $PKG_BUILD/libextra/.libs/libgnutls-openssl.so* $INSTALL/usr/lib
+    rm -rf $INSTALL/usr/lib/libgnutls-openssl.so*T
--- a/packages/toolchain/devel/binutils/build
+++ b/packages/toolchain/devel/binutils/build
@ -52,7 +52,7 @@ mkdir -p objdir && cd objdir
             --enable-version-specific-runtime-libs \
             $WITH_64B_BFD \
             --enable-plugins \
-             --enable-gold \
+             --enable-gold=yes \
             --enable-ld=default \
             --enable-lto \
             --disable-nls
--- a/packages/toolchain/devel/binutils/meta
+++ b/packages/toolchain/devel/binutils/meta
@ -19,13 +19,13 @@
 ################################################################################

 PKG_NAME="binutils"
-PKG_VERSION="2.21"
+PKG_VERSION="2.21.51.0.7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
-PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
-#PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="ccache linux-headers gmp mpfr ppl cloog-ppl libelf"
 PKG_PRIORITY="optional"
--- a/packages/toolchain/devel/binutils/patches/binutils-2.21.51.0.7-multi_os_directory.patch
+++ b/packages/toolchain/devel/binutils/patches/binutils-2.21.51.0.7-multi_os_directory.patch
--- a/packages/toolchain/devel/binutils/patches/binutils-2.21.51.0.7-visibility.patch
+++ b/packages/toolchain/devel/binutils/patches/binutils-2.21.51.0.7-visibility.patch
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@ -26,7 +26,8 @@ strip_lto  # Fails to compile with GCC's link time optimization.
 strip_gold # Fails to compile using the gold linker.

 # Filter out some problematic CFLAGS
-  CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||" -e "s|-O.|-O2|"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-O2|"`

 # set some CFLAGS we need
  CFLAGS="$CFLAGS -g -fno-stack-protector"
@ -114,7 +115,7 @@ EOF
             --enable-bind-now \
             --with-elf \
             --with-tls \
-             --enable-kernel=2.6.37 \
+             --enable-kernel=2.6.35 \
             --with-__thread \
             --with-binutils=$BUILD/toolchain/bin \
             --with-headers=$SYSROOT_PREFIX/usr/include \
--- a/packages/toolchain/devel/eglibc/meta
+++ b/packages/toolchain/devel/eglibc/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="eglibc"
-PKG_VERSION="2.12-12750"
+PKG_VERSION="2.13-13177"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-13177-libgcc_eh-1.patch
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-13177-libgcc_eh-1.patch
--- a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-13177-select_fd_type.patch
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-13177-select_fd_type.patch
--- a/packages/tools/installer/scripts/installer
+++ b/packages/tools/installer/scripts/installer
@ -137,7 +137,7 @@ do_install_mbr() {

  # show menu
    MSG_TITLE="\Z4[ (RE)INSTALL MBR ]\Zn"
-    MSG_MENU="\n Please select the Device to install MBR\n\n Please choose an item:"
+    MSG_MENU="\n Please select where to install MBR.\n\n Please select a device:"
    MSG_CANCEL="Back"

    create_device_list
@ -169,7 +169,7 @@ do_install_quick() {

  # show menu
    MSG_TITLE="\Z4[ QUICK INSTALL MENU ]\Zn"
-    MSG_MENU="\n You can use the UP/DOWN arrow keys,\n the No. of the choice as a hot key,\n to choose an option.\n\n Please choose an item:"
+    MSG_MENU="\n You can use the UP/DOWN arrow keys,\n or the number of the choice as a hotkey,\n to choose an option.\n\n Please select a device:"
    MSG_CANCEL="Back"

    create_device_list
@ -195,7 +195,7 @@ do_install_quick() {
          msg_progress_install "7" "creating label on $INSTALL_DEVICE"
            parted -s $INSTALL_DEVICE mklabel msdos >> $LOGFILE 2>&1

-          msg_progress_install "9" "writing MBR on $INSTALL_DEVICE"
+          msg_progress_install "9" "writing Master Boot Record on $INSTALL_DEVICE"
            cat /usr/share/syslinux/mbr.bin > $INSTALL_DEVICE

          msg_progress_install "10" "creating partition on $INSTALL_DEVICE"
@ -207,7 +207,7 @@ do_install_quick() {
          msg_progress_install "16" "setup bootflag on partition 1 of $INSTALL_DEVICE"
            parted -s $INSTALL_DEVICE set 1 boot on >> $LOGFILE 2>&1

-          msg_progress_install "20" "tell kernel we have a new partitiontable on $INSTALL_DEVICE"
+          msg_progress_install "20" "tell the kernel we have a new partitiontable on $INSTALL_DEVICE"
            partprobe $INSTALL_DEVICE >> $LOGFILE 2>&1

        # create filesystem
@ -273,7 +273,7 @@ do_install_quick() {
 msg_not_implemented() {
  # show an dialog that this function is not yet implemented
    MSG_TITLE="\Z2[ WORK IN PROGRESS ]\Zn"
-    MSG_INFOBOX=" This function is not yet implemented \n stay tuned!!!"
+    MSG_INFOBOX=" This function is not implemented yet."

    dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70
 }
@ -281,7 +281,7 @@ msg_not_implemented() {
 msg_oem_only() {
  # show an dialog that this function is only implemented on special builds
    MSG_TITLE="\Z2[ FOR OEM ONLY ]\Zn"
-    MSG_INFOBOX=" OEM only feature, this function is not implemented in this build! \n if you have questions about this feature \n visit http://www.openelec.tv!!!"
+    MSG_INFOBOX=" OEM only feature, this function is not implemented in this build. \n if you have questions about this feature \n visit http://www.openelec.tv"

    dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70
 }
@ -289,15 +289,15 @@ msg_oem_only() {
 msg_warning_beta() {
  # show an warning dialog if we use beta software
    MSG_TITLE="\Z1[ BETA WARNING ]\Zn"
-    MSG_INFOBOX=" This installer is Beta \n use it on your own risk!!! \n Please make first an backup !"
+    MSG_INFOBOX=" This installer is  for beta versions. \n This means this sofware have not been tested yet. \n Please make sure you have a backup of \n your files before going any further."

    dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70
 }

 msg_no_device() {
  # show an warning dialog if we dont find not mounted devices for install and return to main menu
-    MSG_TITLE="\Z1[ INFORMATION ]\Zn"
-    MSG_INFOBOX=" Not found any devices to install. \n be sure you have connected your device via USB or (e)SATA. \n Please try again !"
+    MSG_TITLE="\Z1[ WARNING ]\Zn"
+    MSG_INFOBOX=" No devices were found. \n If you are trying to install on a \n brand new harddisk you must create atleast \n one partition. Otherwise it won't be found. \n If you dont know how, ask in the forum or on IRC."

    dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70

@ -336,8 +336,8 @@ menu_main() {

    dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \
      --title "$MSG_TITLE" --menu "$MSG_MENU" 20 70 5 \
-        1 "Quick Install OpenELEC" \
-        2 "Custom Install OpenELEC" \
+        1 "Quick Install of OpenELEC" \
+        2 "Custom Install of OpenELEC" \
        3 "Setup OpenELEC" \
        4 "BIOS update (only for OEM's)" \
        5 "Show logfile" 2> $TMPDIR/mainmenu
@ -371,7 +371,7 @@ menu_setup() {
 menu_bios() {
  # show the biosmenu
    MSG_TITLE="\Z4[ BIOS MENU ]\Zn"
-    MSG_MENU="\n You can use the UP/DOWN arrow keys,\n the No. of the choice as a hot key,\n to choose an option.\n\n Please choose an item:"
+    MSG_MENU="\n You can use the UP/DOWN arrow keys,\n or the number of the choice as a hotkey,\n to choose an option.\n\n Please choose a device:"
    MSG_CANCEL="Back"

    dialog --colors --backtitle "$BACKTITLE" --cancel-label "$MSG_CANCEL" \
--- a/packages/x11/driver/xf86-video-ati/meta
+++ b/packages/x11/driver/xf86-video-ati/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="xf86-video-ati"
-PKG_VERSION="6.14.0"
+PKG_VERSION="6.14.1"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
--- a/packages/x11/driver/xf86-video-ati/patches/xf86-video-ati-6.14.0-01-fix_build_with_xorg-server-1.10.patch
+++ b/packages/x11/driver/xf86-video-ati/patches/xf86-video-ati-6.14.0-01-fix_build_with_xorg-server-1.10.patch
@ -1,33 +0,0 @@
-From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001
-From: Sedat Dilek <sedat.dilek@googlemail.com>
-Date: Fri, 25 Feb 2011 20:48:14 +0000
-Subject: UMS: Fix build against xserver 1.10-rc3
-
-This issue was introduced due to last minute backout of RandR-1.4
-in xserver 1.10-rc3.
-
-Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard.
-See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>.
-
-Note:
-The ddx needs a rebuild as the X video driver ABI changed to version 10.0.
-
-Reported-by: Alex Deucher <alexdeucher@gmail.com>
-CC: Keith Packard <keithp@keithp.com>
-Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
-diff --git a/src/radeon_output.c b/src/radeon_output.c
-index 15cef06..ccde346 100644
--- a/src/radeon_output.c
-+++ b/src/radeon_output.c
-@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output)
- 	xf86CrtcPtr crtc = output->crtc;
- 
- 	if (crtc->enabled) {
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
-+#ifdef RANDR_14_INTERFACE
- 	    xf86CrtcSetRec crtc_set_rec;
- 
- 	    crtc_set_rec.flags = (XF86CrtcSetMode |
--
-cgit v0.8.3-6-g21f6
--- a/packages/x11/driver/xf86-video-omapfb/build
+++ b/packages/x11/driver/xf86-video-omapfb/build
@ -0,0 +1,41 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options
+
+if [ "$TARGET_FPU" = neon -o "$TARGET_FPU" = neon-fp16 ]; then
+  CFG_NEON="--enable-neon"
+else
+  CFG_NEON="--disable-neon"
+fi
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared \
+            --with-xorg-module-dir=$XORG_PATH_MODULES \
+            $CFG_NEON \
+
+make
--- a/packages/x11/driver/xf86-video-omapfb/install
+++ b/packages/x11/driver/xf86-video-omapfb/install
@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options
+
+mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
+  cp $PKG_BUILD/src/.libs/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
--- a/packages/x11/driver/xf86-video-omapfb/meta
+++ b/packages/x11/driver/xf86-video-omapfb/meta
@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xf86-video-omapfb"
+PKG_VERSION="0446176"
+PKG_REV="1"
+PKG_ARCH="arm"
+PKG_LICENSE="OSS"
+PKG_SITE="http://cgit.pingu.fi/xf86-video-omapfb"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libXrender libXext libX11"
+PKG_BUILD_DEPENDS="toolchain libXrender libXext xorg-server"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/driver"
+PKG_SHORTDESC="xf86-video-ompafb: OMAP3/4 framebuffer display driver"
+PKG_LONGDESC="This driver for the X.Org X server (see xserver-xorg for a further description) provides support for OMAP3/4 framebuffer devices."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
--- a/packages/x11/lib/libX11/meta
+++ b/packages/x11/lib/libX11/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="libX11"
-PKG_VERSION="1.4.1"
+PKG_VERSION="1.4.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/x11/lib/libXi/meta
+++ b/packages/x11/lib/libXi/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="libXi"
-PKG_VERSION="1.4.1"
+PKG_VERSION="1.4.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/packages/x11/util/util-macros/meta
+++ b/packages/x11/util/util-macros/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="util-macros"
-PKG_VERSION="1.12.0"
+PKG_VERSION="1.13.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -83,6 +83,14 @@
 # Configuration for u-boot
  UBOOT_CONFIG=""

+# Kernel to use. values can be:
+# default:  default mainline kernel
+# ti-omap4: Ti's OMAP4 kernel
+  LINUX="default"
+
+# use linux-next (latest rc) instead latest released version
+  LINUX_NEXT="no"
+
 # Mediacenter to use (xbmc / xbmc-pvr / no)
  MEDIACENTER="xbmc-pvr"

--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -83,6 +83,14 @@
 # Configuration for u-boot
  UBOOT_CONFIG=""

+# Kernel to use. values can be:
+# default:  default mainline kernel
+# ti-omap4: Ti's OMAP4 kernel
+  LINUX="default"
+
+# use linux-next (latest rc) instead latest released version
+  LINUX_NEXT="no"
+
 # Mediacenter to use (xbmc / xbmc-pvr / no)
  MEDIACENTER="xbmc-pvr"

--- a/projects/ION/options
+++ b/projects/ION/options
@ -83,6 +83,14 @@
 # Configuration for u-boot
  UBOOT_CONFIG=""

+# Kernel to use. values can be:
+# default:  default mainline kernel
+# ti-omap4: Ti's OMAP4 kernel
+  LINUX="default"
+
+# use linux-next (latest rc) instead latest released version
+  LINUX_NEXT="no"
+
 # Mediacenter to use (xbmc / xbmc-pvr / no)
  MEDIACENTER="xbmc-pvr"

--- a/projects/Intel/options
+++ b/projects/Intel/options
@ -83,6 +83,14 @@
 # Configuration for u-boot
  UBOOT_CONFIG=""

+# Kernel to use. values can be:
+# default:  default mainline kernel
+# ti-omap4: Ti's OMAP4 kernel
+  LINUX="default"
+
+# use linux-next (latest rc) instead latest released version
+  LINUX_NEXT="no"
+
 # Mediacenter to use (xbmc / xbmc-pvr / no)
  MEDIACENTER="xbmc-pvr"

--- a/tools/mkpkg/mkpkg_libjpeg-turbo
+++ b/tools/mkpkg/mkpkg_libjpeg-turbo
@ -20,23 +20,26 @@
 ################################################################################

 echo "getting sources..."
-  svn co https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo/trunk libjpeg-turbo-latest
+  svn co svn://svn.eglibc.org/branches/eglibc-2_13/libc eglibc-2.13-latest
+  svn co svn://svn.eglibc.org/branches/eglibc-2_13/ports eglibc-2.13-latest/ports
+  svn co svn://svn.eglibc.org/branches/eglibc-2_13/linuxthreads/linuxthreads eglibc-2.13-latest/linuxthreads
+  svn co svn://svn.eglibc.org/branches/eglibc-2_13/linuxthreads/linuxthreads_db eglibc-2.13-latest/linuxthreads_db

 echo "getting version..."
-  cd libjpeg-turbo-latest
+  cd eglibc-2.13-latest
    SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
    echo $SVN_REV
  cd ..

 echo "copying sources..."
-  rm -rf libjpeg-turbo-$SVN_REV
-  cp -R libjpeg-turbo-latest libjpeg-turbo-$SVN_REV
+  rm -rf eglibc-2.13-$SVN_REV
+  cp -R eglibc-2.13-latest eglibc-2.13-$SVN_REV

 echo "cleaning sources..."
-  find libjpeg-turbo-$SVN_REV -name .svn -exec rm -rf {} ";"
+  find eglibc-2.13-$SVN_REV -name .svn -exec rm -rf {} ";"

 echo "packing sources..."
-  tar cvjf libjpeg-turbo-$SVN_REV.tar.bz2 libjpeg-turbo-$SVN_REV
+  tar cvjf eglibc-2.13-$SVN_REV.tar.bz2 eglibc-2.13-$SVN_REV

 echo "remove temporary sourcedir..."
-  rm -rf libjpeg-turbo-$SVN_REV
+  rm -rf eglibc-2.13-$SVN_REV