[oe-commits] org.oe.dev merge of '4161ac48e6849d2ce053bdbb00d74e709247fd18'
thesing commit
oe at amethyst.openembedded.net
Thu Jul 31 14:40:51 UTC 2008
merge of '4161ac48e6849d2ce053bdbb00d74e709247fd18'
and '6542fbe2d509990c5d4b56b4adaf0df31a29c221'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 949adb41213e343f3ef7985a1f9c38ec086c4a41
ViewMTN: http://monotone.openembedded.org/revision/info/949adb41213e343f3ef7985a1f9c38ec086c4a41
Files:
1
packages/linux/linux-kexecboot.inc
packages/dsplink/files/ticel-config
packages/linux/linux-omap2-git/beagleboard/serialfix.diff
conf/machine/htcpolaris.conf
packages/linux/linux-omap2-git/beagleboard/01-gptimer_maintain_tldr_lt_0xffffffff
packages/linux/linux-omap2-git/beagleboard/02-gptimer_clear_tocr
packages/swfdec/swfdec-mozilla_0.7.4.bb
packages/swfdec/swfdec_0.7.4.bb
packages/dsplink/codec-engine_2.10.bb
packages/dsplink/dsplink_1.50.bb
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/linux/linux-kaiser_2.6.24+git.bb
packages/linux/linux-omap2_git.bb
packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
packages/linux/linux-rp_2.6.26.bb
Diffs:
#
# mt diff -r4161ac48e6849d2ce053bdbb00d74e709247fd18 -r949adb41213e343f3ef7985a1f9c38ec086c4a41
#
#
#
# patch "packages/linux/linux-kexecboot.inc"
# from [1a5dde189f3eed29477082972af6e8298f55c4a6]
# to [b1e9350d2c88928146c9e589e65cb802829b65c1]
#
============================================================
--- packages/linux/linux-kexecboot.inc 1a5dde189f3eed29477082972af6e8298f55c4a6
+++ packages/linux/linux-kexecboot.inc b1e9350d2c88928146c9e589e65cb802829b65c1
@@ -2,6 +2,7 @@ LICENSE = "GPL"
SECTION = "kernel"
LICENSE = "GPL"
+DONT_CHECK_KERNELSIZE = ""
INITRAMFS_IMAGE = "initramfs-kexec-image"
inherit kernel
PACKAGES = ""
#
# mt diff -r6542fbe2d509990c5d4b56b4adaf0df31a29c221 -r949adb41213e343f3ef7985a1f9c38ec086c4a41
#
#
#
# delete "packages/dsplink/files/ticel-config"
#
# delete "packages/linux/linux-omap2-git/beagleboard/serialfix.diff"
#
# add_file "conf/machine/htcpolaris.conf"
# content [bace1967854f817e81f88e99cda797aeadd07831]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/01-gptimer_maintain_tldr_lt_0xffffffff"
# content [7c9bf439882aa8c9a61562b641bd230143c75fb9]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/02-gptimer_clear_tocr"
# content [0f618ebc4d656a0020964339216cfd22e2662469]
#
# add_file "packages/swfdec/swfdec-mozilla_0.7.4.bb"
# content [3b786eeb603090b3e0f7353aae7c9c2bd33ad7e4]
#
# add_file "packages/swfdec/swfdec_0.7.4.bb"
# content [0762edf2e24dc90e87a5d8b2bd766b981a1bc058]
#
# patch "packages/dsplink/codec-engine_2.10.bb"
# from [332e3019b56cf0c6eaf5edf7c8fb23451cb14134]
# to [163e8a7925cf09ffaea2ad9d8caba979718cd2d4]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [0de167bdd761e3c8b3fb707da0f0c1d1b048402b]
# to [433cc5e3ea3a71746f3232fa0b654152ee7e4171]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [e3046b95c386745454ecdf90ff6eed7e7cea6039]
# to [a907fbb10775925c12156c9558ee1d21c462e567]
#
# patch "packages/ffmpeg/omapfbplay_git.bb"
# from [4649b54f81c86dc3f8fa7324ed4a5b8ccc3d764c]
# to [090aadc107c8cd4a265045153958712162056f03]
#
# patch "packages/linux/linux-kaiser_2.6.24+git.bb"
# from [4c1d297ed2650a9ec5c683f87ef9189967a1afde]
# to [179f47a7546391b82d05471702ef85d5ff831bc9]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [d1968e8ba7639627d6db87ba953b800c24ef27ea]
# to [9117272d8b2908df59a233aaf707e94115da1631]
#
# patch "packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch"
# from [e87d480dedb22e40b8be1f27bad9b1b4946c405a]
# to [2e74a69e842e3c0680535808d03f43717cb19a5d]
#
# patch "packages/linux/linux-rp_2.6.26.bb"
# from [ff9b4547b7210312365df450c44cf68b21e2987a]
# to [3fe7077dd4707984593d30eb66cafde62b2120f6]
#
============================================================
--- conf/machine/htcpolaris.conf bace1967854f817e81f88e99cda797aeadd07831
+++ conf/machine/htcpolaris.conf bace1967854f817e81f88e99cda797aeadd07831
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: HTC Polaris phone
+#@DESCRIPTION: Machine configuration for HTC Polaris phone
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
+FEED_ARCH = "armv6"
+BASE_PACKAGE_ARCH = "armv6"
+
+
+IMAGE_FSTYPES ?= "tar.gz cpio.gz"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"
+
+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard bluetooth"
============================================================
--- packages/linux/linux-omap2-git/beagleboard/01-gptimer_maintain_tldr_lt_0xffffffff 7c9bf439882aa8c9a61562b641bd230143c75fb9
+++ packages/linux/linux-omap2-git/beagleboard/01-gptimer_maintain_tldr_lt_0xffffffff 7c9bf439882aa8c9a61562b641bd230143c75fb9
@@ -0,0 +1,62 @@
+3430 TRM 16.2.4.2 states:
+
+From: Paul Walmsley <paul at pwsan.com>
+
+Do not put the overflow value (0xFFFFFFFF) in the GPTi.TLDR register
+ because it can lead to undesired results.
+
+3430 TRM 16.2.4.7 states:
+
+ In the non-PWM mode, GTPi.TLDR must be maintained at less than or
+ equal to 0xFFFF FFFE.
+
+This patch contains some debugging code, and so is not yet intended for
+merging into linux-omap.
+---
+
+ arch/arm/mach-omap2/timer-gp.c | 17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
+index 557603f..edc0c9e 100644
+--- a/arch/arm/mach-omap2/timer-gp.c
++++ b/arch/arm/mach-omap2/timer-gp.c
+@@ -59,6 +59,11 @@ static struct irqaction omap2_gp_timer_irq = {
+ static int omap2_gp_timer_set_next_event(unsigned long cycles,
+ struct clock_event_device *evt)
+ {
++ if (cycles == 0) {
++ pr_err("*** cycles = 0! fixing\n");
++ cycles = 1;
++ }
++
+ omap_dm_timer_set_load_start(gptimer, 0, 0xffffffff - cycles);
+
+ return 0;
+@@ -76,6 +81,15 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode,
+ period = clk_get_rate(omap_dm_timer_get_fclk(gptimer)) / HZ;
+ period -= 1;
+
++ /*
++ * Unlikely that this will ever be hit since periodic
++ * mode is rarely used
++ */
++ if (period == 0) {
++ pr_err("*** period = 0! fixing\n");
++ period = 1;
++ }
++
+ omap_dm_timer_set_load_start(gptimer, 1, 0xffffffff - period);
+ break;
+ case CLOCK_EVT_MODE_ONESHOT:
+@@ -117,8 +131,9 @@ static void __init omap2_gp_clockevent_init(void)
+ clockevent_gpt.shift);
+ clockevent_gpt.max_delta_ns =
+ clockevent_delta2ns(0xffffffff, &clockevent_gpt);
++ /* per 3430 TRM table 16-11 */
+ clockevent_gpt.min_delta_ns =
+- clockevent_delta2ns(1, &clockevent_gpt);
++ clockevent_delta2ns(2, &clockevent_gpt);
+
+ clockevent_gpt.cpumask = cpumask_of_cpu(0);
+ clockevents_register_device(&clockevent_gpt);
============================================================
--- packages/linux/linux-omap2-git/beagleboard/02-gptimer_clear_tocr 0f618ebc4d656a0020964339216cfd22e2662469
+++ packages/linux/linux-omap2-git/beagleboard/02-gptimer_clear_tocr 0f618ebc4d656a0020964339216cfd22e2662469
@@ -0,0 +1,97 @@
+OMAP2/3 GPTIMER: clear TOCR register after timer overflow interrupt and during load
+
+From: Paul Walmsley <paul at pwsan.com>
+
+There appears to be a hardware bug in the 1-ms tick generation section
+of the GPTIMER blocks on some OMAP3530 chips. TOCR is sometimes
+incremented when a a timer overflow event occurs and TPIR = TPNR =
+TOWR = TOCR = 0, in contradiction of 34xx TRM 16.2.4.2.1. When TOCR
+is incremented under these conditions, the timer will not generate any
+further overflow interrupts. (The kernel currently relies on overflow
+interrupts to generate ticks and drive the scheduler.)
+
+This patch works around the bug by clearing TOCR in the GPTIMER
+overflow ISR and in the timer load functions.
+
+The precise sequence of hardware events needed to reproduce this bug
+is still unknown. Without this patch, the bug is consistently
+observable on several BeagleBoards (including mine and Koen's) within
+a few minutes of boot. It's not clear whether this bug is present on
+all OMAP3 revisions, or whether it is simply specific to certain
+OMAP3530ES2.2 lots.
+
+This patch fixes the "serial hangs" reported by some BeagleBoard
+users. During these hangs, characters are still received from the
+serial port, so magic SysRq will still work; but characters are never
+delivered on to the underlying line discipline. This since
+tty_flip_buffer_push() uses schedule_delayed_work() to defer passing
+the input buffer to the line discipline, but the delayed work function
+is never called since no timer tick ever arrives.
+
+The patch should also fix some other sporadic boot hangs reported by
+BeagleBoard users that are due to timer interrupt non-delivery.
+---
+
+ arch/arm/mach-omap2/timer-gp.c | 1 +
+ arch/arm/plat-omap/dmtimer.c | 8 ++++++++
+ include/asm-arm/arch-omap/dmtimer.h | 2 ++
+ 3 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
+index edc0c9e..869fe14 100644
+--- a/arch/arm/mach-omap2/timer-gp.c
++++ b/arch/arm/mach-omap2/timer-gp.c
+@@ -44,6 +44,7 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id)
+ struct omap_dm_timer *gpt = (struct omap_dm_timer *)dev_id;
+ struct clock_event_device *evt = &clockevent_gpt;
+
++ omap_dm_timer_clear_ovf_cnt(gpt);
+ omap_dm_timer_write_status(gpt, OMAP_TIMER_INT_OVERFLOW);
+
+ evt->event_handler(evt);
+diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
+index f22506a..2cbb4cc 100644
+--- a/arch/arm/plat-omap/dmtimer.c
++++ b/arch/arm/plat-omap/dmtimer.c
+@@ -543,6 +543,8 @@ void omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
+ while (readl(timer->io_base + (OMAP_TIMER_WRITE_PEND_REG & 0xff)))
+ cpu_relax();
+
++ omap_dm_timer_write_reg(timer, OMAP_TIMER_TICK_INT_MASK_SET_REG, 0);
++
+ omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 0);
+ }
+
+@@ -561,6 +563,7 @@ void omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
+
+ omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, load);
+ omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);
++ omap_dm_timer_write_reg(timer, OMAP_TIMER_TICK_INT_MASK_SET_REG, 0);
+ omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
+ }
+
+@@ -614,6 +617,11 @@ void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
+ omap_dm_timer_write_reg(timer, OMAP_TIMER_WAKEUP_EN_REG, value);
+ }
+
++void omap_dm_timer_clear_ovf_cnt(struct omap_dm_timer *timer)
++{
++ omap_dm_timer_write_reg(timer, OMAP_TIMER_TICK_INT_MASK_SET_REG, 0);
++}
++
+ unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
+ {
+ unsigned int l;
+diff --git a/include/asm-arm/arch-omap/dmtimer.h b/include/asm-arm/arch-omap/dmtimer.h
+index 02b29e8..7b1138b 100644
+--- a/include/asm-arm/arch-omap/dmtimer.h
++++ b/include/asm-arm/arch-omap/dmtimer.h
+@@ -73,6 +73,8 @@ void omap_dm_timer_set_prescaler(struct omap_dm_timer *timer, int prescaler);
+
+ void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer, unsigned int value);
+
++void omap_dm_timer_clear_ovf_cnt(struct omap_dm_timer *timer);
++
+ unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer);
+ void omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value);
+ unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer);
============================================================
--- packages/swfdec/swfdec-mozilla_0.7.4.bb 3b786eeb603090b3e0f7353aae7c9c2bd33ad7e4
+++ packages/swfdec/swfdec-mozilla_0.7.4.bb 3b786eeb603090b3e0f7353aae7c9c2bd33ad7e4
@@ -0,0 +1,19 @@
+DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations."
+LICENSE = "LGPL"
+
+DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
+RDEPENDS = "gst-ffmpeg"
+
+SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \
+"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/mozilla/plugins/*.so"
+FILES_${PN}-dev += "${libdir}/mozilla/plugins/*a"
+FILES_${PN}-dbg += "${libdir}/mozilla/plugins/.debug"
+
============================================================
--- packages/swfdec/swfdec_0.7.4.bb 0762edf2e24dc90e87a5d8b2bd766b981a1bc058
+++ packages/swfdec/swfdec_0.7.4.bb 0762edf2e24dc90e87a5d8b2bd766b981a1bc058
@@ -0,0 +1,26 @@
+DESCRIPTION = "Swfdec is a decoder/renderer for Macromedia Flash animations."
+LICENSE = "LGPL"
+
+DEPENDS = "gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib"
+
+SRC_URI = "http://swfdec.freedesktop.org/download/swfdec/0.7/${P}.tar.gz \
+"
+
+inherit autotools pkgconfig
+
+do_install_append() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/player/.libs/swfplay ${D}/${bindir}
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES =+ "libswfdecgtk libswfdec"
+
+FILES_${PN} += "${datadir}/icons"
+FILES_libswfdec = "${libdir}/libswfdec-0.7.so.*"
+FILES_libswfdecgtk = "${libdir}/libswfdec-gtk-0.7.so*"
+
+
============================================================
--- packages/dsplink/codec-engine_2.10.bb 332e3019b56cf0c6eaf5edf7c8fb23451cb14134
+++ packages/dsplink/codec-engine_2.10.bb 163e8a7925cf09ffaea2ad9d8caba979718cd2d4
@@ -14,7 +14,6 @@ SRC_URI = "http://install.tarball.in.sou
SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz \
file://xdcpaths.mak \
- file://ticel-config \
"
S = "${WORKDIR}/codec_engine_2_10_01"
@@ -137,10 +136,6 @@ do_stage() {
cp -pPr $header ${STAGING_INCDIR}/codec-engine/$(echo $header | sed s:${S}::g)
done
- sed -i -e s:SEDME_CFLAGS:"-I${TITOOLSDIR}/${TIBIOSDIR}/xdctools/packages -I${STAGING_INCDIR}/codec-engine/packages -I${STAGING_INCDIR}/codec-engine/cetools/packages/":g \
- -e s:SEDME_STAGINGLIBDIR:${STAGING_LIBDIR}:g \
- ${WORKDIR}/ticel-config
- install -m 0755 ${WORKDIR}/ticel-config ${STAGING_BINDIR_CROSS}
}
pkg_postinst_${PN}-module () {
============================================================
--- packages/dsplink/dsplink_1.50.bb 0de167bdd761e3c8b3fb707da0f0c1d1b048402b
+++ packages/dsplink/dsplink_1.50.bb 433cc5e3ea3a71746f3232fa0b654152ee7e4171
@@ -1,6 +1,6 @@ require dsplink.inc
require dsplink.inc
-PR = "r9"
+PR = "r10"
PE = "1"
PV = "1.50"
============================================================
--- packages/ffmpeg/ffmpeg_git.bb e3046b95c386745454ecdf90ff6eed7e7cea6039
+++ packages/ffmpeg/ffmpeg_git.bb a907fbb10775925c12156c9558ee1d21c462e567
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r18"
+PR = "r19"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ SRCREV = "3692b8de9fae73860be636606cb634
FFBRANCH ?= "master"
SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "c6bbb0c33f6f681b8265a43f8744735de5a9d45e"
+SRCREV_arm = "a3f0e289611cb79254ea8ba01923a6693422679d"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
============================================================
--- packages/ffmpeg/omapfbplay_git.bb 4649b54f81c86dc3f8fa7324ed4a5b8ccc3d764c
+++ packages/ffmpeg/omapfbplay_git.bb 090aadc107c8cd4a265045153958712162056f03
@@ -2,7 +2,7 @@ LICENSE = "MIT"
DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
inherit module-base
@@ -15,7 +15,7 @@ S = "${WORKDIR}/git"
S = "${WORKDIR}/git"
-CFLAGS += " -static -I${STAGING_KERNEL_DIR}/include "
+CFLAGS += " -I${STAGING_KERNEL_DIR}/include "
do_compile() {
oe_runmake -e
============================================================
--- packages/linux/linux-kaiser_2.6.24+git.bb 4c1d297ed2650a9ec5c683f87ef9189967a1afde
+++ packages/linux/linux-kaiser_2.6.24+git.bb 179f47a7546391b82d05471702ef85d5ff831bc9
@@ -4,13 +4,14 @@ COMPATIBLE_MACHINE = "htckaiser"
PR = "r1"
COMPATIBLE_MACHINE = "htckaiser"
+COMPATIBLE_MACHINE = "htcpolaris"
+
SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git"
S = "${WORKDIR}/git"
do_configure_prepend() {
- cp arch/arm/configs/htckaiser_defconfig ../defconfig
+ cp arch/arm/configs/${MACHINE}_defconfig ../defconfig
}
-
============================================================
--- packages/linux/linux-omap2_git.bb d1968e8ba7639627d6db87ba953b800c24ef27ea
+++ packages/linux/linux-omap2_git.bb 9117272d8b2908df59a233aaf707e94115da1631
@@ -6,7 +6,7 @@ PV = "2.6.26"
PV = "2.6.26"
#PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}"
-PR = "r50"
+PR = "r51"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -29,7 +29,6 @@ SRC_URI_append_beagleboard = " file://no
file://06-ensure-fclk.diff;patch=1 \
file://07-set-burst-size.diff;patch=1 \
file://cache-display-fix.patch;patch=1 \
- file://serialfix.diff;patch=1 \
file://i2c-omap-race-fix.diff;patch=1 \
file://TWL4030-01.patch;patch=1 \
file://TWL4030-02.patch;patch=1 \
@@ -46,6 +45,8 @@ SRC_URI_append_beagleboard = " file://no
file://4bitmmc.diff;patch=1 \
file://400khz-i2c.diff;patch=1 \
file://no-cortex-deadlock.patch;patch=1 \
+ file://01-gptimer_maintain_tldr_lt_0xffffffff;patch=1 \
+ file://02-gptimer_clear_tocr;patch=1 \
"
SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
============================================================
--- packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch e87d480dedb22e40b8be1f27bad9b1b4946c405a
+++ packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch 2e74a69e842e3c0680535808d03f43717cb19a5d
@@ -14,23 +14,54 @@ Signed-off-by: Mark Brown <broonie at opens
Reported-by: Stanislav Brabec <utx at penguin.cz>
Signed-off-by: Mark Brown <br%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list