From 12f279b37d07e82dadd4e51642cfceb80ccbbce9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 9 Nov 2008 10:28:16 +0100 Subject: linux-omap git: add patch to fix red-tint on omap3evm screens --- .../linux-omap/omap3evm/omap3evm-lcd-redtint.diff | 66 ++++++++++++++++++++++ packages/linux/linux-omap_git.bb | 3 +- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-omap/omap3evm/omap3evm-lcd-redtint.diff (limited to 'packages') diff --git a/packages/linux/linux-omap/omap3evm/omap3evm-lcd-redtint.diff b/packages/linux/linux-omap/omap3evm/omap3evm-lcd-redtint.diff new file mode 100644 index 0000000000..54ea3c9f68 --- /dev/null +++ b/packages/linux/linux-omap/omap3evm/omap3evm-lcd-redtint.diff @@ -0,0 +1,66 @@ +Message-ID: +Date: Sat, 27 Sep 2008 03:46:18 -0400 +From: "arun c" +To: "Daniel Schaeffer" +Subject: Re: OMAP3EVM LCD red tint + +Hi Daniel Schaeffer + +On Fri, Sep 26, 2008 at 4:20 PM, Daniel Schaeffer + wrote: +> Has anyone looked into why the LCD display on the OMAP3EVM is always tinted +> red? I created a couple of color test images that I cat'ed to /dev/fb and it +> looks like the blue color channel is completely ignored. I was testing on +> v2.6.26-omap2 but is doesn't look like there have been any changes to the fb +> driver since then so I'm assuming the issue is also present in the head of +> the git tree. +> +> Regards, +> +> Daniel Schaeffer +> + +Try the patch below(Remember that you may have to manually edit because +this patch is against current HEAD) + + +diff --git a/drivers/video/omap/lcd_omap3evm.c +b/drivers/video/omap/lcd_omap3evm.c +index a564ca5..821bafe 100644 +--- a/drivers/video/omap/lcd_omap3evm.c ++++ b/drivers/video/omap/lcd_omap3evm.c +@@ -44,6 +44,8 @@ + #define ENABLE_VDAC_DEV_GRP 0x20 + #define ENABLE_VPLL2_DEDICATED 0x05 + #define ENABLE_VPLL2_DEV_GRP 0xE0 ++#define TWL4030_VPLL2_DEV_GRP 0x33 ++#define TWL4030_VPLL2_DEDICATED 0x36 + + #define TWL_LED_LEDEN 0x00 + #define TWL_PWMA_PWMAON 0x00 +@@ -86,12 +88,24 @@ static void omap3evm_panel_cleanup(struct lcd_panel *panel) + + static int omap3evm_panel_enable(struct lcd_panel *panel) + { ++ if (omap_rev > OMAP3430_REV_ES1_0) { ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ENABLE_VPLL2_DEV_GRP, TWL4030_VPLL2_DEV_GRP); ++ } + omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 0); + return 0; + } + + static void omap3evm_panel_disable(struct lcd_panel *panel) + { ++ if (omap_rev > OMAP3430_REV_ES1_0) { ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, ++ TWL4030_VPLL2_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, ++ TWL4030_VPLL2_DEV_GRP); ++ } + omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1); + } + + diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 72684249b9..66029225c4 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -10,7 +10,7 @@ SRCREV = "f7429fd378a29cf6947c2613e0fd6e6e36165167" PV = "2.6.27+2.6.28-rc3+${PR}+gitr${SRCREV}" #PV = "2.6.27+${PR}+gitr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -50,6 +50,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ SRC_URI_append_omap3evm = " \ file://evm-mcspi-ts.diff;patch=1 \ + file://omap3evm-lcd-redtint.diff;patch=1 \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From dda91f2523aa41b263094bc3bcffeabc4b1b2b8d Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sun, 9 Nov 2008 09:42:44 +0000 Subject: glib-2.0: apply patch from Andrea Adami to make thumb work with 2.18.1 --- .../glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch | 42 ++++++++++++++++++++++ packages/glib-2.0/glib-2.0_2.18.1.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 packages/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch (limited to 'packages') diff --git a/packages/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch b/packages/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch new file mode 100644 index 0000000000..d7aa08821f --- /dev/null +++ b/packages/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch @@ -0,0 +1,42 @@ +# gatomic.c uses SWP, which doesn't work in Thumb mode. +# Put that source file into a separate convenience library which is always built as ARM. + +Index: glib-2.18.1/glib/Makefile.am +=================================================================== +--- glib-2.18.1/glib/Makefile.am 2008-09-18 00:33:57.000000000 +0200 ++++ glib-2.18.1/glib/Makefile.am 2008-11-08 10:13:27.000000000 +0100 +@@ -80,6 +80,7 @@ + galiasdef.c + + lib_LTLIBRARIES = libglib-2.0.la ++noinst_LTLIBRARIES = libgatomic.la + + if OS_WIN32_AND_DLL_COMPILATION + if MS_LIB_AVAILABLE +@@ -96,10 +97,14 @@ + uninstall-ms-lib: + $(uninstall_ms_lib_cmd) + ++libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb ++ ++libgatomic_la_SOURCES = \ ++ gatomic.c ++ + libglib_2_0_la_SOURCES = \ + garray.c \ + gasyncqueue.c \ +- gatomic.c \ + gbacktrace.c \ + gbase64.c \ + gbookmarkfile.c \ +@@ -286,8 +291,8 @@ + pcre_inc = + endif + +-libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) +-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) ++libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la ++libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la + + libglib_2_0_la_LDFLAGS = \ + $(glib_win32_res_ldflag) \ diff --git a/packages/glib-2.0/glib-2.0_2.18.1.bb b/packages/glib-2.0/glib-2.0_2.18.1.bb index 3ac0487018..1083ef4ba0 100644 --- a/packages/glib-2.0/glib-2.0_2.18.1.bb +++ b/packages/glib-2.0/glib-2.0_2.18.1.bb @@ -9,3 +9,4 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1 \ " +SRC_URI_append_arm = "file://atomic-thumb.patch;patch=1" -- cgit v1.2.3 From 0661316d45aadb91a8bc807e26d7ded3ec1ec0ae Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 9 Nov 2008 09:51:58 +0000 Subject: bluez-utils: apply sbc-thumb.patch for 3.36 --- packages/bluez/bluez-utils_3.36.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/bluez/bluez-utils_3.36.bb b/packages/bluez/bluez-utils_3.36.bb index cf6d6328ea..403e32b1e2 100644 --- a/packages/bluez/bluez-utils_3.36.bb +++ b/packages/bluez/bluez-utils_3.36.bb @@ -2,9 +2,10 @@ require bluez-utils3.inc PR = "r1" +# removed hciattach-ti-bts.patch (landed upstream) SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ - " + file://sbc-thumb.patch;patch=1" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ -- cgit v1.2.3 From 33085259dfbe1004f38efe40853b72ee166c834b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 9 Nov 2008 16:08:35 +0100 Subject: pyorbit: update to 2.24.0 --- packages/gnome/pyorbit_2.24.0.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/gnome/pyorbit_2.24.0.bb (limited to 'packages') diff --git a/packages/gnome/pyorbit_2.24.0.bb b/packages/gnome/pyorbit_2.24.0.bb new file mode 100644 index 0000000000..fe6e2d1b0b --- /dev/null +++ b/packages/gnome/pyorbit_2.24.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Python Orbit bindings" +LICENSE = "LGPL" + +PR = "r0" + +inherit gnome distutils-base pkgconfig + +SRC_URI += "file://acinclude.m4" + +EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" +EXTRA_OEMAKE = "-e" + +do_configure() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} + export CC=${TARGET_PREFIX}gcc + autotools_do_configure +} + +do_stage() { + install -d ${STAGING_INCDIR}/pyorbit-2 + install -m 0644 src/pyorbit.h ${STAGING_INCDIR}/pyorbit-2 + autotools_stage_all +} -- cgit v1.2.3 From 4991b6049fc18c656caa32fe5b79b6b999e16a3b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 9 Nov 2008 16:12:15 +0100 Subject: gnome-python: fix locations of defs files --- packages/gnome/gnome-python_2.22.1.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/gnome/gnome-python_2.22.1.bb b/packages/gnome/gnome-python_2.22.1.bb index 5ea7cba83a..c21ed9860d 100644 --- a/packages/gnome/gnome-python_2.22.1.bb +++ b/packages/gnome/gnome-python_2.22.1.bb @@ -10,6 +10,7 @@ inherit gnome distutils-base pkgconfig FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" do_configure() { + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac export HOST_SYS=${HOST_SYS} export BUILD_SYS=${BUILD_SYS} autotools_do_configure -- cgit v1.2.3 From 217085b82addded5064fbe2a05e3bcd2671ccfcc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 9 Nov 2008 16:26:05 +0100 Subject: gnome-python: use stage_all instead of stage_includes --- packages/gnome/gnome-python_2.22.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gnome/gnome-python_2.22.1.bb b/packages/gnome/gnome-python_2.22.1.bb index c21ed9860d..0507cba010 100644 --- a/packages/gnome/gnome-python_2.22.1.bb +++ b/packages/gnome/gnome-python_2.22.1.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" DEPENDS = "libgnomeui pyorbit python-pygtk" RDEPENDS = "pyorbit" -PR = "r0" +PR = "r1" inherit gnome distutils-base pkgconfig @@ -16,3 +16,6 @@ do_configure() { autotools_do_configure } +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 6a2d9761df0ae071953dbadd647944c990cb2abe Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 9 Nov 2008 16:31:38 +0100 Subject: gnome-python-desktop: sed some more python locations --- packages/gnome/gnome-python-desktop_2.23.0.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gnome/gnome-python-desktop_2.23.0.bb b/packages/gnome/gnome-python-desktop_2.23.0.bb index c489da124a..140c0a8dbf 100644 --- a/packages/gnome/gnome-python-desktop_2.23.0.bb +++ b/packages/gnome/gnome-python-desktop_2.23.0.bb @@ -1,7 +1,7 @@ LICENSE = "GPL/LGPL" DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui" -PR = "r2" +PR = "r3" inherit gnome distutils-base @@ -14,7 +14,10 @@ do_configure_prepend() { } do_configure_prepend() { - sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes\":g \ + ${S}/configure.ac } AUTOTOOLS_STAGE_PKGCONFIG = "1" -- cgit v1.2.3 From 0bf971196e727b52b84bf2c60d28ec7719ff23e0 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Sun, 9 Nov 2008 20:00:38 +0100 Subject: fso-image.bb: Replace xterm with gpe-terminal They seem to look the same, but gpe-teminal includes a .desktop file --- packages/images/fso-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 8d75782286..992160ec72 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -44,7 +44,7 @@ AUDIO_INSTALL = "\ GTK_INSTALL = "\ openmoko-calculator2 \ - xterm \ + gpe-terminal \ openmoko-terminal2 \ gpe-scap \ tangogps \ -- cgit v1.2.3