[oe-commits] org.oe.dev merge of '7131f28196073180061901d8749502f5acea9a0b'

mickeyl commit oe at amethyst.openembedded.net
Thu Jul 17 19:10:10 UTC 2008


merge of '7131f28196073180061901d8749502f5acea9a0b'
     and 'd96c1b4121283c5dad1b8e0b2cafde6526d5b428'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 470ca3fe64c9411d3a7d992db39d5efbed869839
ViewMTN: http://monotone.openembedded.org/revision/info/470ca3fe64c9411d3a7d992db39d5efbed869839
Files:
1
packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch
packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch
packages/fastcgi/files
packages/ffmpeg/omapfbplay
packages/cacao/cacao-native_0.99.1.bb
packages/classpath/classpath-native_0.97.2.bb
packages/classpath/files/javanet-local.patch
packages/fastcgi/files/link-against-math.patch
packages/ffmpeg/omapfbplay/fbplay-static.diff
packages/ffmpeg/omapfbplay_git.bb
packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff
packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff
packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff
packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff
packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff
packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff
packages/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff
conf/distro/chinook-compat.conf
conf/distro/include/angstrom-glibc.inc
packages/cacao/cacao-native.inc
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/classpath/classpath_0.97.2.bb
packages/fastcgi/fastcgi_2.4.0.bb
packages/ffmpeg/ffmpeg_git.bb
packages/freesmartphone/zhone/80zhone
packages/freesmartphone/zhone_git.bb
packages/images/beagleboard-demo-image.bb
packages/images/fso-image.bb
packages/images/neuros-osd-base-image.bb
packages/jamvm/jamvm-initial_1.5.0.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r7131f28196073180061901d8749502f5acea9a0b -r470ca3fe64c9411d3a7d992db39d5efbed869839
#
#
# no changes
#


#
# mt diff -rd96c1b4121283c5dad1b8e0b2cafde6526d5b428 -r470ca3fe64c9411d3a7d992db39d5efbed869839
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch"
# 
# delete "packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch"
# 
# add_dir "packages/fastcgi/files"
# 
# add_dir "packages/ffmpeg/omapfbplay"
# 
# add_file "packages/cacao/cacao-native_0.99.1.bb"
#  content [99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22]
# 
# add_file "packages/classpath/classpath-native_0.97.2.bb"
#  content [00c39f7324532c966c52166a21c322312b678fb2]
# 
# add_file "packages/classpath/files/javanet-local.patch"
#  content [74de086eb7903959d47d568b0c5659be8f77cdfa]
# 
# add_file "packages/fastcgi/files/link-against-math.patch"
#  content [072e1afbda9f530c7274d0a7966543d862e4c5f3]
# 
# add_file "packages/ffmpeg/omapfbplay/fbplay-static.diff"
#  content [39aa924c731660c6f60aa4bee0e0f16bbba80123]
# 
# add_file "packages/ffmpeg/omapfbplay_git.bb"
#  content [17bff7c91288bcd756e1d9b4f7c54bb3ebcc64ec]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff"
#  content [578467287022f996cc9d3299955710ffec11630b]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff"
#  content [25293160c17c02f86cea5ad77f502d4e5dc589a0]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff"
#  content [c9d93591d917a914510f918b6537229154b51ab6]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff"
#  content [eb5be9105f8c9f513ac8f5805509fd1f699d7217]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff"
#  content [38ebbe5406926e875c19096f7ed74df898888fb4]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff"
#  content [06f7d37a0c0ba2e57774a439c3be844b0a0ec5b6]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff"
#  content [7503ac6e8f68204349b8460ad5f3ce695eb28162]
# 
# patch "conf/distro/chinook-compat.conf"
#  from [82f061f680e83ac8f98ea7c468da6ace94ccba60]
#    to [61ddfe57a63bdd965dd857bd75478e87045007b9]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [3713139bc7b46ff4bc175e324f936414dd660e59]
#    to [62520e6f06c372811a13891d31a33e8723a29d92]
# 
# patch "packages/cacao/cacao-native.inc"
#  from [cc20995498c174c9ac504a54e5d844cfddfb8f3f]
#    to [07b702fccb42b3216ccbc83f1e71c7ef63a0c5bc]
# 
# patch "packages/classpath/classpath_0.95.bb"
#  from [e7719be862652c7d80851c9e91f373cdcca5b3fb]
#    to [eda6d3cac12670b78a50f4ed467945e8d94251b5]
# 
# patch "packages/classpath/classpath_0.96.1.bb"
#  from [33e806e4b65b649a2b4005bd15cb10f3d86c7df7]
#    to [bbcb9594be6e39c9de041c9161493fdcca794c2b]
# 
# patch "packages/classpath/classpath_0.97.2.bb"
#  from [4fbb51684632f12c592c40ad772a35edea74b77e]
#    to [278cb300abf8c1fd2c84992aad5b9a71d2f050e5]
# 
# patch "packages/fastcgi/fastcgi_2.4.0.bb"
#  from [865f9d310ddf05e89de798145b06cce3ece5b683]
#    to [2801e4594a4cb85ac3d88807719e4447918dc14d]
# 
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [64b784ccdafe69b684df27bf1e7040588a54b936]
#    to [dd0dfbb0e116e12cbef829defa334905ca9fa64c]
# 
# patch "packages/freesmartphone/zhone/80zhone"
#  from [43dab662e1e74efbb2cef5e105862517a274e13b]
#    to [6c327481cd6f37425767d829d37ba75bd4ef7490]
# 
# patch "packages/freesmartphone/zhone_git.bb"
#  from [7e10cc3a3a4d6766da632530801d16417495bbff]
#    to [a7c3f434ee7bee53eea765eab5e7cd972ac50362]
# 
# patch "packages/images/beagleboard-demo-image.bb"
#  from [4d5ef75d06c67bfb38408d85c478c77ebb96e226]
#    to [a5e29d5371d9630726fac8ef24450a866fcd1dec]
# 
# patch "packages/images/fso-image.bb"
#  from [ed48a221328cfc4e99587341b1139811a37425d9]
#    to [0145db2bc64800d30a356637950a2d66daa6b503]
# 
# patch "packages/images/neuros-osd-base-image.bb"
#  from [c917176930daa9aa78c1264ea7bc13edf825a943]
#    to [55e02451a61b84f5d6c47acfeab218b9afea1c42]
# 
# patch "packages/jamvm/jamvm-initial_1.5.0.bb"
#  from [08d6c4fd24b6e2bf4ac4e75a896b575f9431bfa4]
#    to [26cbc2490a0489f6e819962e91a7b3818413106a]
# 
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
#  from [61306895c6b0bae840d63008e1d83ad6488255cb]
#    to [560914bc9a5ea2d1a400c348659a241349d2640d]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [e6f17b9cec8b3cfa0d93d2fd47b21c197a3b7d7a]
#    to [038137f8660e7c39b96a18d3d3947f245e440d45]
#
============================================================
--- packages/cacao/cacao-native_0.99.1.bb	99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22
+++ packages/cacao/cacao-native_0.99.1.bb	99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22
@@ -0,0 +1,7 @@
+require cacao-native.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
+  "
+
============================================================
--- packages/classpath/classpath-native_0.97.2.bb	00c39f7324532c966c52166a21c322312b678fb2
+++ packages/classpath/classpath-native_0.97.2.bb	00c39f7324532c966c52166a21c322312b678fb2
@@ -0,0 +1,13 @@
+require classpath-native.inc
+
+PR = "r0"
+
+# The code affected by the javanet-local patch
+# is usually not compiled. However if someone changes
+# to --enable-local-sockets it will.
+SRC_URI += "\
+  file://netif_16.patch;patch=1;pnum=0 \
+  file://SimpleName.diff;patch=1;pnum=0 \
+  file://javanet-local.patch;patch=1;pnum=0 \
+  "
+
============================================================
--- packages/classpath/files/javanet-local.patch	74de086eb7903959d47d568b0c5659be8f77cdfa
+++ packages/classpath/files/javanet-local.patch	74de086eb7903959d47d568b0c5659be8f77cdfa
@@ -0,0 +1,37 @@
+Index: native/jni/java-net/local.c
+===================================================================
+RCS file: /sources/classpath/classpath/native/jni/java-net/local.c,v
+retrieving revision 1.4
+diff -u -r1.4 local.c
+--- native/jni/java-net/local.c	17 Apr 2007 21:46:27 -0000	1.4
++++ native/jni/java-net/local.c	27 Jun 2008 13:14:40 -0000
+@@ -73,27 +73,18 @@
+   return socket (PF_UNIX, stream ? SOCK_STREAM : SOCK_DGRAM, 0);
+ }
+ 
+-static int gcc_sucks = 0;
+-
+ int
+ local_bind (int fd, const char *addr)
+ {
+   struct sockaddr_un saddr;
+ 
+-  /* For some reason, GCC 4.0.1 on Darwin/x86 MODIFIES the `addr'
+-     pointer in the CALLER's STACK FRAME after calling this function,
+-     but if we add this statement below, it doesn't!  */
+-  if (gcc_sucks)
+-    fprintf (stderr, "bind %p\n", addr);
+-
+-  if (strlen (addr) > sizeof (saddr.sun_path))
++  if (strlen (addr) >= sizeof (saddr.sun_path))
+     {
+       errno = ENAMETOOLONG;
+       return -1;
+     }
+ 
+-  strncpy (saddr.sun_path, addr, sizeof (saddr.sun_path));
+-  saddr.sun_path[sizeof (saddr.sun_path)] = '\0';
++  strcpy (saddr.sun_path, addr);
+   saddr.sun_family = AF_LOCAL;
+ 
+   return bind (fd, (struct sockaddr *) &saddr, SUN_LEN (&saddr));
============================================================
--- packages/fastcgi/files/link-against-math.patch	072e1afbda9f530c7274d0a7966543d862e4c5f3
+++ packages/fastcgi/files/link-against-math.patch	072e1afbda9f530c7274d0a7966543d862e4c5f3
@@ -0,0 +1,26 @@
+Need to link against the C math library (-lm) at least for uclibc.
+
+Index: fcgi-2.4.0/cgi-fcgi/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/cgi-fcgi/Makefile.am	2008-07-09 20:54:56.000000000 +0200
++++ fcgi-2.4.0/cgi-fcgi/Makefile.am	2008-07-09 20:55:12.000000000 +0200
+@@ -11,5 +11,5 @@
+ LIBDIR      = ../libfcgi
+ LIBFCGI     = $(LIBDIR)/libfcgi.la
+ 
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c
+Index: fcgi-2.4.0/examples/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/examples/Makefile.am	2008-07-09 20:54:56.000000000 +0200
++++ fcgi-2.4.0/examples/Makefile.am	2008-07-09 20:55:11.000000000 +0200
+@@ -21,7 +21,7 @@
+ LIBDIR      = ../libfcgi
+ LIBFCGI     = $(LIBDIR)/libfcgi.la
+ 
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ 
+ echo_SOURCES       = $(INCLUDE_FILES) echo.c
+ echo_x_SOURCES     = $(INCLUDE_FILES) echo-x.c
============================================================
--- packages/ffmpeg/omapfbplay/fbplay-static.diff	39aa924c731660c6f60aa4bee0e0f16bbba80123
+++ packages/ffmpeg/omapfbplay/fbplay-static.diff	39aa924c731660c6f60aa4bee0e0f16bbba80123
@@ -0,0 +1,10 @@
+--- /tmp/Makefile	2008-07-10 12:59:00.000000000 +0200
++++ git/Makefile	2008-07-10 12:57:38.723198000 +0200
+@@ -5,6 +5,6 @@
+ CFLAGS = -O3 -Wall -fomit-frame-pointer -mcpu=cortex-a8 -mfpu=neon \
+ 	-I$(LINUX)/include -I$(FFMPEG)
+ LDFLAGS = -L$(FFMPEG)/libavcodec -L$(FFMPEG)/libavformat -L$(FFMPEG)/libavutil
+-LDLIBS = -lavformat -lavcodec -lavutil -lm -lz -lpthread
++LDLIBS = -lavformat -lavcodec -lavutil -lz -ldl -lbz2 -lfaac -lgsm -lmp3lame -lm -lpthread
+ 
+ all: omapfbplay
============================================================
--- packages/ffmpeg/omapfbplay_git.bb	17bff7c91288bcd756e1d9b4f7c54bb3ebcc64ec
+++ packages/ffmpeg/omapfbplay_git.bb	17bff7c91288bcd756e1d9b4f7c54bb3ebcc64ec
@@ -0,0 +1,27 @@
+DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
+DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
+LICENSE = "MIT"
+
+PR = "r3"
+
+inherit module-base
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+
+SRCREV = "5d0a1fd4c9733ef8c57823c368e21688344bbeb4"
+SRC_URI = "git://git.mansr.com/${PN};protocol=git \
+           file://fbplay-static.diff;patch=1 "
+
+S = "${WORKDIR}/git"
+
+
+CFLAGS += " -static -I${STAGING_KERNEL_DIR}/include "
+
+do_compile() {
+	oe_runmake -e
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/omapfbplay ${D}/${bindir}/
+}
============================================================
--- packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff	578467287022f996cc9d3299955710ffec11630b
+++ packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff	578467287022f996cc9d3299955710ffec11630b
@@ -0,0 +1,23 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Sat, 5 Jul 2008 20:31:56 +0000 (+0100)
+Subject: omapfb: fix video timings message
+X-Git-Tag: beagle-5~3
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2929b75035ebe8702ba2ff2c81b654c487701f64
+
+omapfb: fix video timings message
+---
+
+diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
+index 418ed9f..1166a01 100644
+--- a/drivers/video/omap/omapfb_main.c
++++ b/drivers/video/omap/omapfb_main.c
+@@ -1789,7 +1789,8 @@ static int omapfb_do_probe(struct platform_device *pdev,
+ 			vram, fbdev->mem_desc.region_cnt);
+ 	pr_info("omapfb: Pixclock %lu kHz hfreq %lu.%lu kHz "
+ 			"vfreq %lu.%lu Hz\n",
+-			phz / 1000, hhz / 10000, hhz % 10, vhz / 10, vhz % 10);
++			phz / 1000, hhz / 10000, hhz % 10000,
++			vhz / 10, vhz % 10);
+ 
+ 	return 0;
+ 
============================================================
--- packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff	25293160c17c02f86cea5ad77f502d4e5dc589a0
+++ packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff	25293160c17c02f86cea5ad77f502d4e5dc589a0
@@ -0,0 +1,22 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Sat, 5 Jul 2008 20:32:38 +0000 (+0100)
+Subject: omap: set CLKSEL_DSS1 to 2
+X-Git-Tag: beagle-5~2
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=d23f9c3c5c6243b626f7ec4c255469de2536e488
+
+omap: set CLKSEL_DSS1 to 2
+---
+
+diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
+index 8fdf8f3..04dedec 100644
+--- a/arch/arm/mach-omap2/clock34xx.c
++++ b/arch/arm/mach-omap2/clock34xx.c
+@@ -596,6 +596,8 @@ int __init omap2_clk_init(void)
+ 	/* u32 clkrate; */
+ 	u32 cpu_clkflg;
+ 
++	__raw_writel(0x1002, io_p2v(0x48004e40));
++
+ 	/* REVISIT: Ultimately this will be used for multiboot */
+ #if 0
+ 	if (cpu_is_omap242x()) {
============================================================
--- packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff	c9d93591d917a914510f918b6537229154b51ab6
+++ packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff	c9d93591d917a914510f918b6537229154b51ab6
@@ -0,0 +1,27 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Sun, 6 Jul 2008 13:15:36 +0000 (+0100)
+Subject: omapfb: enable overlay optimisation when possible
+X-Git-Tag: beagle-5~1
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=a63ac3abdf6781f863112321260fe7a5da757802
+
+omapfb: enable overlay optimisation when possible
+---
+
+diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
+index 6aff476..3b36227 100644
+--- a/drivers/video/omap/dispc.c
++++ b/drivers/video/omap/dispc.c
+@@ -582,11 +582,13 @@ static int omap_dispc_enable_plane(int plane, int enable)
+ 	const u32 at_reg[] = { DISPC_GFX_ATTRIBUTES,
+ 				DISPC_VID1_BASE + DISPC_VID_ATTRIBUTES,
+ 				DISPC_VID2_BASE + DISPC_VID_ATTRIBUTES };
++	unsigned overlay_opt = plane & !!enable & !dispc.color_key.key_type;
+ 	if ((unsigned int)plane > dispc.mem_desc.region_cnt)
+ 		return -EINVAL;
+ 
+ 	enable_lcd_clocks(1);
+ 	MOD_REG_FLD(at_reg[plane], 1, enable ? 1 : 0);
++	MOD_REG_FLD(DISPC_CONTROL, 1<<12 | 1<<5, overlay_opt<<12 | 1<<5);
+ 	enable_lcd_clocks(0);
+ 
+ 	return 0;
============================================================
--- packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff	eb5be9105f8c9f513ac8f5805509fd1f699d7217
+++ packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff	eb5be9105f8c9f513ac8f5805509fd1f699d7217
@@ -0,0 +1,28 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Sun, 6 Jul 2008 13:22:54 +0000 (+0100)
+Subject: omapfb: use PCD if set in panel config
+X-Git-Tag: beagle-5
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=c8060d36ae156771f00a7a27cabf1b4435c378bd
+
+omapfb: use PCD if set in panel config
+---
+
+diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
+index 3b36227..4e1a8e3 100644
+--- a/drivers/video/omap/dispc.c
++++ b/drivers/video/omap/dispc.c
+@@ -798,7 +798,13 @@ static void set_lcd_timings(void)
+ 	l |= panel->acb & 0xff;
+ 	dispc_write_reg(DISPC_POL_FREQ, l);
+ 
+-	calc_ck_div(is_tft, panel->pixel_clock * 1000, &lck_div, &pck_div);
++	if (panel->pcd) {
++		pck_div = panel->pcd;
++		lck_div = 1;
++	} else {
++		calc_ck_div(is_tft, panel->pixel_clock * 1000,
++			    &lck_div, &pck_div);
++	}
+ 
+ 	l = dispc_read_reg(DISPC_DIVISOR);
+ 	l &= ~(FLD_MASK(16, 8) | FLD_MASK(0, 8));
============================================================
--- packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff	38ebbe5406926e875c19096f7ed74df898888fb4
+++ packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff	38ebbe5406926e875c19096f7ed74df898888fb4
@@ -0,0 +1,45 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Mon, 7 Jul 2008 00:13:00 +0000 (+0100)
+Subject: omapfb: fix display panning
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=9fec252c96b0e69bcef0afd9cb9dd72b7179c239
+
+omapfb: fix display panning
+---
+
+diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
+index 4e1a8e3..c17371c 100644
+--- a/drivers/video/omap/dispc.c
++++ b/drivers/video/omap/dispc.c
+@@ -435,6 +435,8 @@ static inline int _setup_plane(int plane, int channel_out,
+ 
+ 	dispc_write_reg(ri_reg[plane], (screen_width - width) * bpp / 8 + 1);
+ 
++	MOD_REG_FLD(DISPC_CONTROL, 1<<5, 1<<5);
++
+ 	return height * screen_width * bpp / 8;
+ }
+ 
+diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
+index 1166a01..3e4959e 100644
+--- a/drivers/video/omap/omapfb_main.c
++++ b/drivers/video/omap/omapfb_main.c
+@@ -206,8 +206,8 @@ static int ctrl_change_mode(struct fb_info *fbi)
+ 	struct omapfb_device *fbdev = plane->fbdev;
+ 	struct fb_var_screeninfo *var = &fbi->var;
+ 
+-	offset = var->yoffset * fbi->fix.line_length +
+-		 var->xoffset * var->bits_per_pixel / 8;
++	offset = (var->yoffset * var->xres_virtual + var->xoffset) *
++		var->bits_per_pixel / 8;
+ 
+ 	if (fbdev->ctrl->sync)
+ 		fbdev->ctrl->sync();
+@@ -423,6 +423,8 @@ static void set_fb_fix(struct fb_info *fbi)
+ 	}
+ 	fix->accel		= FB_ACCEL_OMAP1610;
+ 	fix->line_length	= var->xres_virtual * bpp / 8;
++	fix->xpanstep		= 1;
++	fix->ypanstep		= 1;
+ }
+ 
+ static int set_color_mode(struct omapfb_plane_struct *plane,
============================================================
--- packages/linux/linux-omap2-git/%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list