diff options
Diffstat (limited to 'packages')
31 files changed, 379 insertions, 240 deletions
diff --git a/packages/cacao/cacao-native.inc b/packages/cacao/cacao-native.inc index 26d3d37f58..f4eee16cf6 100644 --- a/packages/cacao/cacao-native.inc +++ b/packages/cacao/cacao-native.inc @@ -13,15 +13,24 @@ S = "${WORKDIR}/cacao-${PV}" inherit native autotools EXTRA_OECONF = "\ - --enable-debug \ - --with-classpath-libdir=${libdir} \ - --with-classpath-includedir=${includedir}/classpath \ - --with-classpath-classes=${datadir}/classpath/glibj.zip \ - --with-vm-zip=${datadir}/cacao/vm.zip \ - " + --enable-debug \ + --with-vm-zip=${datadir}/cacao/vm.zip \ + \ + --with-classpath-libdir=${libdir_jni}:${libdir} \ + --with-classpath-includedir=${incdir}/classpath \ + --with-classpath-classes=${datadir}/classpath/glibj.zip \ + \ + --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ + --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \ + --with-jni_md_h=${incdir}/classpath \ + --with-jni_h=${incdir}/classpath \ + " -# force usage of ecj-initial (but Java5-compatible class library) -export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip" +# force usage of ecj-initial +# Important: Not specifying the bootclasspath argument here is only supported +# for Cacao >= 0.99. Earlier Cacao may need the BCP set to a Java5-capable +# class library. +export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" # force usage of fastjar -export JAR=fastjar +export JAR="fastjar" diff --git a/packages/cacao/cacao-native_0.99.1.bb b/packages/cacao/cacao-native_0.99.1.bb new file mode 100644 index 0000000000..1cf0cb70cf --- /dev/null +++ b/packages/cacao/cacao-native_0.99.1.bb @@ -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 \ + " + diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb new file mode 100644 index 0000000000..e744b3378e --- /dev/null +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -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 \ + " + diff --git a/packages/classpath/classpath_0.95.bb b/packages/classpath/classpath_0.95.bb index 0b2090f72f..45ce04f519 100644 --- a/packages/classpath/classpath_0.95.bb +++ b/packages/classpath/classpath_0.95.bb @@ -3,9 +3,10 @@ require classpath.inc SRC_URI += "\ file://gjar-prefix-patch.diff;patch=1;pnum=0 \ file://xmlstream-fix.patch;patch=1;pnum=0 \ + file://javanet-local.patch;patch=1;pnum=0 \ " -PR = "r3" +PR = "r4" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb index 9d347a0303..6952cda72f 100644 --- a/packages/classpath/classpath_0.96.1.bb +++ b/packages/classpath/classpath_0.96.1.bb @@ -3,9 +3,10 @@ require classpath.inc SRC_URI += "\ file://gjar-prefix-patch.diff;patch=1;pnum=0 \ file://xmlstream-fix.patch;patch=1;pnum=0 \ + file://javanet-local.patch;patch=1;pnum=0 \ " -PR = "r5" +PR = "r6" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb index 338ebcf0d4..fafe0bbb88 100644 --- a/packages/classpath/classpath_0.97.2.bb +++ b/packages/classpath/classpath_0.97.2.bb @@ -3,9 +3,10 @@ require classpath.inc SRC_URI += "\ file://netif_16.patch;patch=1;pnum=0 \ file://SimpleName.diff;patch=1;pnum=0 \ + file://javanet-local;patch=1;pnum=0 \ " -PR = "r0" +PR = "r1" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/files/javanet-local.patch b/packages/classpath/files/javanet-local.patch new file mode 100644 index 0000000000..b8d1584e7c --- /dev/null +++ b/packages/classpath/files/javanet-local.patch @@ -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)); diff --git a/packages/fastcgi/fastcgi_2.4.0.bb b/packages/fastcgi/fastcgi_2.4.0.bb index beada396cd..4c70aa3461 100644 --- a/packages/fastcgi/fastcgi_2.4.0.bb +++ b/packages/fastcgi/fastcgi_2.4.0.bb @@ -1,8 +1,9 @@ LICENSE = "Open Market" DESCRIPTION = "Fast CGI backend (web server to CGI handler) library" -PR = "r1" +PR = "r2" -SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz" +SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz \ +file://link-against-math.patch;patch=1" S=${WORKDIR}/fcgi-${PV} @@ -16,6 +17,3 @@ do_stage() { autotools_stage_all } -do_compile() { -} - diff --git a/packages/fastcgi/files/.mtn2git_empty b/packages/fastcgi/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fastcgi/files/.mtn2git_empty diff --git a/packages/fastcgi/files/link-against-math.patch b/packages/fastcgi/files/link-against-math.patch new file mode 100644 index 0000000000..37a9a038ce --- /dev/null +++ b/packages/fastcgi/files/link-against-math.patch @@ -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 diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index c287b86623..0c9936a2f9 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -42,7 +42,7 @@ EXTRA_OECONF = " \ --enable-libfaadbin \ --enable-libgsm \ --enable-libmp3lame \ - --enable-swscale \ + --disable-swscale \ --arch=${TARGET_ARCH} \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ @@ -63,7 +63,7 @@ do_stage() { for lib in libavcodec libavdevice libavformat \ libavutil libpostproc libswscale do - oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} + oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true install -d ${STAGING_INCDIR}/$lib done @@ -79,7 +79,8 @@ do_stage() { for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h do install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h - done + install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h + done for h in adler32.h avstring.h avutil.h base64.h bswap.h \ common.h crc.h fifo.h integer.h intfloat_readwrite.h \ diff --git a/packages/ffmpeg/omapfbplay/.mtn2git_empty b/packages/ffmpeg/omapfbplay/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ffmpeg/omapfbplay/.mtn2git_empty diff --git a/packages/ffmpeg/omapfbplay/fbplay-static.diff b/packages/ffmpeg/omapfbplay/fbplay-static.diff new file mode 100644 index 0000000000..439fc6e6bb --- /dev/null +++ b/packages/ffmpeg/omapfbplay/fbplay-static.diff @@ -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 diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb new file mode 100644 index 0000000000..e87550207f --- /dev/null +++ b/packages/ffmpeg/omapfbplay_git.bb @@ -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}/ +} diff --git a/packages/freesmartphone/zhone/80zhone b/packages/freesmartphone/zhone/80zhone index 90a1e95b39..5a36e873f4 100644 --- a/packages/freesmartphone/zhone/80zhone +++ b/packages/freesmartphone/zhone/80zhone @@ -1,4 +1,4 @@ #!/bin/sh -e -zhone --fullscreen > /tmp/zhone.log 2>&1 & +zhone > /tmp/zhone.log 2>&1 & renice -3 $! exit 0 diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb index a766eb1ab5..8a4a21bbed 100644 --- a/packages/freesmartphone/zhone_git.bb +++ b/packages/freesmartphone/zhone_git.bb @@ -4,7 +4,7 @@ SECTION = "x11" DEPENDS = "edje-native python-pyrex-native python-cython-native" RDEPENDS = "task-python-efl python-textutils python-dbus" PV = "0.0.0+gitr${SRCREV}" -PR = "r6" +PR = "r7" SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \ file://80zhone" diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index 67632ff0a9..6ac22916dd 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -28,6 +28,7 @@ IMAGE_INSTALL = "\ powertop oprofile \ pidgin \ # irssi \ + mplayer omapfbplay \ " IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index c257158a12..173f598770 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -18,7 +18,9 @@ BASE_INSTALL = "\ # getting an X window system up X_INSTALL = "\ - matchbox-wm \ + e-wm \ + illume \ + illume-theme \ ${XSERVER} \ xserver-kdrive-common \ xserver-nodm-init \ diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb index ddf524574a..d2e39760c8 100644 --- a/packages/images/neuros-osd-base-image.bb +++ b/packages/images/neuros-osd-base-image.bb @@ -1,7 +1,15 @@ # This image is intended to be the base for further neuros images +inherit image + +export IMAGE_BASENAME = "Neuros-OSD2-base-image" + +PR = "r1" + # Select which Secure Shell Daemon gets included into the rootfs DISTRO_SSH_DAEMON ?= "dropbear" +DISTRO_DEV_MANAGER = "mdev" +PREFERRED_PROVIDER_hotplug = "mdev" # Include a timestamp that initscripts can use to set the time to a # more sane value after a reboot @@ -9,10 +17,10 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" IMAGE_INSTALL = "task-boot \ util-linux-mount util-linux-umount \ + e2fsprogs dosfstools \ + wireless-tools zd1211-firmware \ ${DISTRO_SSH_DAEMON} \ - " + qt-embedded dbus \ + " IMAGE_LINGUAS = "" - -inherit image - diff --git a/packages/jamvm/jamvm-initial_1.5.0.bb b/packages/jamvm/jamvm-initial_1.5.0.bb index 3369733340..a1c415dd62 100644 --- a/packages/jamvm/jamvm-initial_1.5.0.bb +++ b/packages/jamvm/jamvm-initial_1.5.0.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" DEPENDS = "zlib-native classpath-initial jikes-initial" +PR = "r1" + PROVIDES = "virtual/java-initial" S = "${WORKDIR}/jamvm-${PV}" @@ -18,7 +20,7 @@ ARM_INSTRUCTION_SET = "arm" inherit native autotools EXTRA_OECONF = "\ - --with-classpath-install-dir=${STAGING_DIR_NATIVE}\ + --with-classpath-install-dir=${prefix} \ --program-suffix=-initial \ " diff --git a/packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff b/packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff new file mode 100644 index 0000000000..89fbe3a836 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/01-fix-timing-print.diff @@ -0,0 +1,23 @@ +From: Mans Rullgard <mans@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; + diff --git a/packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff b/packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff new file mode 100644 index 0000000000..c437f145d3 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/02-set-clkseld11.diff @@ -0,0 +1,22 @@ +From: Mans Rullgard <mans@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()) { diff --git a/packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff b/packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff new file mode 100644 index 0000000000..9fa749f5fc --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/03-enable-overlay-opt.diff @@ -0,0 +1,27 @@ +From: Mans Rullgard <mans@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; diff --git a/packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff b/packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff new file mode 100644 index 0000000000..bdf8ab5f0b --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/04-use-pcd.diff @@ -0,0 +1,28 @@ +From: Mans Rullgard <mans@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)); diff --git a/packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff b/packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff new file mode 100644 index 0000000000..d3c9fffcda --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/05-fix-display-panning.diff @@ -0,0 +1,45 @@ +From: Mans Rullgard <mans@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, diff --git a/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff b/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff new file mode 100644 index 0000000000..79871a7208 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/06-ensure-fclk.diff @@ -0,0 +1,31 @@ +From: Mans Rullgard <mans@mansr.com> +Date: Mon, 7 Jul 2008 23:59:08 +0000 (+0100) +Subject: omapfb: ensure fck/lcd < 173MHz +X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=0523ece1bad659c48c66aea364d83f7490e7e5ae + +omapfb: ensure fck/lcd < 173MHz +--- + +diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c +index c17371c..85d6cad 100644 +--- a/drivers/video/omap/dispc.c ++++ b/drivers/video/omap/dispc.c +@@ -738,14 +738,16 @@ static void setup_color_conv_coef(void) + MOD_REG_FLD(at2_reg, (1 << 11), ct->full_range); + } + ++#define MAX_FCK_LCD 173000000 ++ + static void calc_ck_div(int is_tft, int pck, int *lck_div, int *pck_div) + { + unsigned long fck, lck; + +- *lck_div = 1; + pck = max(1, pck); + fck = clk_get_rate(dispc.dss1_fck); +- lck = fck; ++ *lck_div = (fck + MAX_FCK_LCD - 1) / MAX_FCK_LCD; ++ lck = fck / *lck_div; + *pck_div = (lck + pck - 1) / pck; + if (is_tft) + *pck_div = max(2, *pck_div); diff --git a/packages/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff b/packages/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff new file mode 100644 index 0000000000..99bd80eae0 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/07-set-burst-size.diff @@ -0,0 +1,21 @@ +From: Mans Rullgard <mans@mansr.com> +Date: Tue, 8 Jul 2008 18:26:43 +0000 (+0100) +Subject: omapfb: set graphics burst size to 16x32 +X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=4f9e415dfcd5613a8de973f6c9878cab959c5869 + +omapfb: set graphics burst size to 16x32 +--- + +diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c +index 85d6cad..fd06ca2 100644 +--- a/drivers/video/omap/dispc.c ++++ b/drivers/video/omap/dispc.c +@@ -409,7 +409,7 @@ static inline int _setup_plane(int plane, int channel_out, + l |= cconv_en << 9; + + l &= ~(0x03 << burst_shift); +- l |= DISPC_BURST_8x32 << burst_shift; ++ l |= DISPC_BURST_16x32 << burst_shift; + + l &= ~(1 << chout_shift); + l |= chout_val << chout_shift; diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 0b4af695d8..6381271cf9 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1246,7 +1246,7 @@ CONFIG_FB_OMAP_079M3R=y # CONFIG_FB_OMAP_092M9R is not set # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set -CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4 +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=8 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # diff --git a/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch b/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch deleted file mode 100644 index 25e5aad9c9..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/omap3-dppl-divider.patch +++ /dev/null @@ -1,114 +0,0 @@ -From linux-omap-owner@vger.kernel.org Tue Jun 24 09:24:30 2008 -Received: from localhost - ([127.0.0.1] helo=dominion ident=koen) - by dominion.dominion.void with esmtp (Exim 4.63) - (envelope-from <linux-omap-owner@vger.kernel.org>) - id 1KB2tB-0005XT-FQ - for koen@localhost; Tue, 24 Jun 2008 09:24:30 +0200 -Received: from xs.service.utwente.nl [130.89.5.250] - by dominion with POP3 (fetchmail-6.3.6) - for <koen@localhost> (single-drop); Tue, 24 Jun 2008 09:24:29 +0200 (CEST) -Received: from mail.service.utwente.nl ([130.89.5.254]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959); - Tue, 24 Jun 2008 09:13:04 +0200 -Received: from mx.utwente.nl ([130.89.2.13]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959); - Tue, 24 Jun 2008 09:13:03 +0200 -Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) - by mx.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m5O7CcD7008917 - for <k.kooi@student.utwente.nl>; Tue, 24 Jun 2008 09:12:38 +0200 -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1751623AbYFXHMh (ORCPT <rfc822;k.kooi@student.utwente.nl>); - Tue, 24 Jun 2008 03:12:37 -0400 -Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751670AbYFXHMh - (ORCPT <rfc822;linux-omap-outgoing>); - Tue, 24 Jun 2008 03:12:37 -0400 -Received: from utopia.booyaka.com ([72.9.107.138]:47392 "EHLO - utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1751623AbYFXHMg (ORCPT - <rfc822;linux-omap@vger.kernel.org>); Tue, 24 Jun 2008 03:12:36 -0400 -Received: (qmail 1797 invoked by uid 526); 24 Jun 2008 07:12:35 -0000 -Date: Tue, 24 Jun 2008 01:12:35 -0600 (MDT) -From: Paul Walmsley <paul@pwsan.com> -To: linux-omap@vger.kernel.org -Subject: [PATCH] OMAP3 clock: DPLL{1,2}_FCLK clksel can divide by 4 -Message-ID: <alpine.DEB.1.00.0806240111320.9741@utopia.booyaka.com> -User-Agent: Alpine 1.00 (DEB 882 2007-12-20) -MIME-Version: 1.0 -Content-Type: TEXT/PLAIN; charset=US-ASCII -Sender: linux-omap-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-omap.vger.kernel.org> -X-Mailing-List: linux-omap@vger.kernel.org -X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk@icts.utwente.nl for more information. -X-UTwente-MailScanner: Found to be clean -X-UTwente-MailScanner-From: linux-omap-owner@vger.kernel.org -X-Spam-Status: No -X-OriginalArrivalTime: 24 Jun 2008 07:13:04.0264 (UTC) FILETIME=[BE950880:01C8D5C9] - - -OMAP34xx ES2 TRM Delta G to H states that the divider for DPLL1_FCLK and -DPLL2_FCLK can divide by 4 in addition to dividing by 1 and 2. Encode this -into the OMAP3 clock framework. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - arch/arm/mach-omap2/clock34xx.h | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h -index b4dceea..9605744 100644 ---- a/arch/arm/mach-omap2/clock34xx.h -+++ b/arch/arm/mach-omap2/clock34xx.h -@@ -1029,8 +1029,15 @@ static struct clk corex2_fck = { - - /* DPLL power domain clock controls */ - --static const struct clksel div2_core_clksel[] = { -- { .parent = &core_ck, .rates = div2_rates }, -+static const struct clksel_rate div4_rates[] = { -+ { .div = 1, .val = 1, .flags = RATE_IN_343X | DEFAULT_RATE }, -+ { .div = 2, .val = 2, .flags = RATE_IN_343X }, -+ { .div = 4, .val = 4, .flags = RATE_IN_343X }, -+ { .div = 0 } -+}; -+ -+static const struct clksel div4_core_clksel[] = { -+ { .parent = &core_ck, .rates = div4_rates }, - { .parent = NULL } - }; - -@@ -1044,7 +1051,7 @@ static struct clk dpll1_fck = { - .init = &omap2_init_clksel_parent, - .clksel_reg = _OMAP34XX_CM_REGADDR(MPU_MOD, OMAP3430_CM_CLKSEL1_PLL), - .clksel_mask = OMAP3430_MPU_CLK_SRC_MASK, -- .clksel = div2_core_clksel, -+ .clksel = div4_core_clksel, - .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | - PARENT_CONTROLS_CLOCK, - .recalc = &omap2_clksel_recalc, -@@ -1119,7 +1126,7 @@ static struct clk dpll2_fck = { - .init = &omap2_init_clksel_parent, - .clksel_reg = _OMAP34XX_CM_REGADDR(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSEL1_PLL), - .clksel_mask = OMAP3430_IVA2_CLK_SRC_MASK, -- .clksel = div2_core_clksel, -+ .clksel = div4_core_clksel, - .flags = CLOCK_IN_OMAP343X | RATE_PROPAGATES | - PARENT_CONTROLS_CLOCK, - .recalc = &omap2_clksel_recalc, -@@ -1155,6 +1162,11 @@ static struct clk iva2_ck = { - - /* Common interface clocks */ - -+static const struct clksel div2_core_clksel[] = { -+ { .parent = &core_ck, .rates = div2_rates }, -+ { .parent = NULL } -+}; -+ - static struct clk l3_ick = { - .name = "l3_ick", - .parent = &core_ck, --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - diff --git a/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch b/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch deleted file mode 100644 index 2e0dfd9f13..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/omap3-jitter.patch +++ /dev/null @@ -1,95 +0,0 @@ -From linux-omap-owner@vger.kernel.org Tue Jun 24 09:24:30 2008 -Received: from localhost - ([127.0.0.1] helo=dominion ident=koen) - by dominion.dominion.void with esmtp (Exim 4.63) - (envelope-from <linux-omap-owner@vger.kernel.org>) - id 1KB2tC-0005XT-Mj - for koen@localhost; Tue, 24 Jun 2008 09:24:30 +0200 -Received: from xs.service.utwente.nl [130.89.5.250] - by dominion with POP3 (fetchmail-6.3.6) - for <koen@localhost> (single-drop); Tue, 24 Jun 2008 09:24:30 +0200 (CEST) -Received: from mail.service.utwente.nl ([130.89.5.253]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959); - Tue, 24 Jun 2008 09:20:48 +0200 -Received: from smtp.utwente.nl ([130.89.2.8]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959); - Tue, 24 Jun 2008 09:20:47 +0200 -Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) - by smtp.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m5O7BPWU031214 - for <k.kooi@student.utwente.nl>; Tue, 24 Jun 2008 09:11:25 +0200 -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1751128AbYFXHLY (ORCPT <rfc822;k.kooi@student.utwente.nl>); - Tue, 24 Jun 2008 03:11:24 -0400 -Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751405AbYFXHLX - (ORCPT <rfc822;linux-omap-outgoing>); - Tue, 24 Jun 2008 03:11:23 -0400 -Received: from utopia.booyaka.com ([72.9.107.138]:44580 "EHLO - utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1751128AbYFXHLX (ORCPT - <rfc822;linux-omap@vger.kernel.org>); Tue, 24 Jun 2008 03:11:23 -0400 -Received: (qmail 1744 invoked by uid 526); 24 Jun 2008 07:11:21 -0000 -Date: Tue, 24 Jun 2008 01:11:21 -0600 (MDT) -From: Paul Walmsley <paul@pwsan.com> -To: linux-omap@vger.kernel.org -Subject: [PATCH] OMAP3 clock: fix DPLL jitter correction and rate - programming -Message-ID: <alpine.DEB.1.00.0806240109440.9741@utopia.booyaka.com> -User-Agent: Alpine 1.00 (DEB 882 2007-12-20) -MIME-Version: 1.0 -Content-Type: TEXT/PLAIN; charset=US-ASCII -Sender: linux-omap-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-omap.vger.kernel.org> -X-Mailing-List: linux-omap@vger.kernel.org -X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk@icts.utwente.nl for more information. -X-UTwente-MailScanner: Found to be clean -X-UTwente-MailScanner-From: linux-omap-owner@vger.kernel.org -X-Spam-Status: No -X-OriginalArrivalTime: 24 Jun 2008 07:20:48.0265 (UTC) FILETIME=[D325F790:01C8D5CA] - - -Fix DPLL jitter correction programming. Previously, -omap3_noncore_dpll_program() stored the FREQSEL jitter correction -parameter to the wrong register. This caused jitter correction to be set -incorrectly and also caused the DPLL divider to be programmed incorrectly. - -Also, fix DPLL divider programming. An off-by-one error existed in -omap3_noncore_dpll_program(), causing DPLLs to be programmed with a higher -divider than intended. - -Signed-off-by: Paul Walmsley <paul@pwsan.com> ---- - - arch/arm/mach-omap2/clock34xx.c | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c -index 408b51a..8fdf8f3 100644 ---- a/arch/arm/mach-omap2/clock34xx.c -+++ b/arch/arm/mach-omap2/clock34xx.c -@@ -346,14 +346,17 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel) - /* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */ - _omap3_noncore_dpll_bypass(clk); - -+ /* Set jitter correction */ -+ v = __raw_readl(dd->control_reg); -+ v &= ~dd->freqsel_mask; -+ v |= freqsel << __ffs(dd->freqsel_mask); -+ __raw_writel(v, dd->control_reg); -+ -+ /* Set DPLL multiplier, divider */ - v = __raw_readl(dd->mult_div1_reg); - v &= ~(dd->mult_mask | dd->div1_mask); -- -- /* Set mult (M), div1 (N), freqsel */ - v |= m << __ffs(dd->mult_mask); -- v |= n << __ffs(dd->div1_mask); -- v |= freqsel << __ffs(dd->freqsel_mask); -- -+ v |= (n - 1) << __ffs(dd->div1_mask); - __raw_writel(v, dd->mult_div1_reg); - - /* We let the clock framework set the other output dividers later */ --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 8392ff7308..797511b5d6 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA SRCREV = "7786cd7a00ae0b18923185789380a88052f4eee7" PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}" -PR = "r40" +PR = "r41" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -21,6 +21,13 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://no-empty-flash-warnings.patch;patch=1 \ file://logo_linux_clut224.ppm \ file://oprofile-0.9.3.armv7.diff;patch=1 \ + file://01-fix-timing-print.diff;patch=1 \ + file://02-set-clkseld11.diff;patch=1 \ + file://03-enable-overlay-opt.diff;patch=1 \ + file://04-use-pcd.diff;patch=1 \ + file://05-fix-display-panning.diff;patch=1 \ + file://06-ensure-fclk.diff;patch=1 \ + file://07-set-burst-size.diff;patch=1 \ " SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \ |