[oe-commits] org.oe.dev merge of '648476e08584946c4059307fb756f1cd7f7fa603'
crofton commit
oe at amethyst.openembedded.net
Wed Jul 30 14:00:43 UTC 2008
merge of '648476e08584946c4059307fb756f1cd7f7fa603'
and 'eb28dc45b262f9456efc6bd50fbcf80645179f8f'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 358ebca4871137902f5525b721deee3b5a7b73ec
ViewMTN: http://monotone.openembedded.org/revision/info/358ebca4871137902f5525b721deee3b5a7b73ec
Files:
1
packages/dsplink/files/dsplink-128M.patch
conf/machine/davinci-dvevm.conf
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.50.bb
packages/dsplink/files/CURRENTCFG.MK
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/mozilla/firefox-3.0
packages/mozilla/firefox-3.0.1
packages/mozilla/firefox_3.0.bb
packages/mozilla/firefox_3.0.1.bb
packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch
packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch
conf/distro/include/sane-srcrevs.inc
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/mozilla/firefox-3.0.1/mozconfig
packages/mythtv/mythtv_0.21.bb
Diffs:
#
# mt diff -r648476e08584946c4059307fb756f1cd7f7fa603 -r358ebca4871137902f5525b721deee3b5a7b73ec
#
#
#
# add_file "packages/dsplink/files/dsplink-128M.patch"
# content [77634bfe405e6a900c9410998682d10c62f69d60]
#
# patch "conf/machine/davinci-dvevm.conf"
# from [b12fca91f474fdad55b2f5419ce9fc3dbbff3621]
# to [7c257968d897ceecb506bc50b6e83ccf5e740b91]
#
# patch "packages/dsplink/dsplink.inc"
# from [9e699e8d88270170f89287867ca77b32b4229d03]
# to [6da19209ce466c39c415f57e67acc29ab812f470]
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [7c50fa88c27a143ecaffccf1adaa106fad6cf643]
# to [0de167bdd761e3c8b3fb707da0f0c1d1b048402b]
#
# patch "packages/dsplink/files/CURRENTCFG.MK"
# from [2d8b0fa316342698cd5493798d1c74ccda6f34fa]
# to [93c29fea0e4eba38148bcebf77b7dc135e72a6a9]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [66de65e75200c4c93b249df7c4c2149d952f85b5]
# to [08ffdd8f902b532c93f402c9a38c62540680bfd7]
#
============================================================
--- packages/dsplink/files/dsplink-128M.patch 77634bfe405e6a900c9410998682d10c62f69d60
+++ packages/dsplink/files/dsplink-128M.patch 77634bfe405e6a900c9410998682d10c62f69d60
@@ -0,0 +1,104 @@
+diff -Nurd dsplink_1_50/dsplink/config/all/CFG_Davinci_DM6446.c dsplink_1_50.work/dsplink/config/all/CFG_Davinci_DM6446.c
+--- dsplink_1_50/dsplink/config/all/CFG_Davinci_DM6446.c 2007-12-03 08:11:41.000000000 -0500
++++ dsplink_1_50.work/dsplink/config/all/CFG_Davinci_DM6446.c 2008-07-29 16:52:28.000000000 -0400
+@@ -69,8 +69,8 @@
+ FALSE, /* AUTOSTART : Autostart the DSP (Not supported) */
+ "DEFAULT.OUT", /* EXECUTABLE : Executable for autostart */
+ TRUE, /* DOPOWERCTRL : Link does the Power Ctrl of DSP. */
+- 0x8FF00020, /* RESUMEADDR : Resume address */
+- 0x8FF00000, /* RESETVECTOR : Reset Vector for the DSP */
++ 0x87000020, /* RESUMEADDR : Resume address */
++ 0x87000000, /* RESETVECTOR : Reset Vector for the DSP */
+ 0x80, /* RESETCODESIZE : Size of code at DSP Reset Vector */
+ 1, /* MADUSIZE : DSP Minimum Addressable Data Unit */
+ (Uint32) -1, /* CPUFREQ : DSP Frequency (in KHz), -1 if default setting is to be used */
+@@ -93,8 +93,8 @@
+ {
+ 0, /* ENTRY : Entry number */
+ "DSPLINKMEM", /* NAME : Name of the memory region */
+- 0x8FE00000, /* ADDRPHYS : Physical address */
+- 0x8FE00000, /* ADDRDSPVIRT : DSP virtual address */
++ 0x87000000, /* ADDRPHYS : Physical address */
++ 0x87000000, /* ADDRDSPVIRT : DSP virtual address */
+ (Uint32) -1, /* ADDRGPPVIRT : GPP virtual address (if known) */
+ 0x5000, /* SIZE : Size of the memory region */
+ TRUE /* SHARED : Shared access memory? */
+@@ -102,8 +102,8 @@
+ {
+ 1, /* ENTRY : Entry number */
+ "DSPLINKMEM1", /* NAME : Name of the memory region */
+- 0x8FE05000, /* ADDRPHYS : Physical address */
+- 0x8FE05000, /* ADDRDSPVIRT : DSP virtual address */
++ 0x87005000, /* ADDRPHYS : Physical address */
++ 0x87005000, /* ADDRDSPVIRT : DSP virtual address */
+ (Uint32) -1, /* ADDRGPPVIRT : GPP virtual address (if known) */
+ 0xFB000, /* SIZE : Size of the memory region */
+ TRUE /* SHARED : Shared access memory? */
+@@ -111,8 +111,8 @@
+ {
+ 2, /* ENTRY : Entry number */
+ "RESETCTRL", /* NAME : Name of the memory region */
+- 0x8FF00000, /* ADDRPHYS : Physical address */
+- 0x8FF00000, /* ADDRDSPVIRT : DSP virtual address */
++ 0x87100000, /* ADDRPHYS : Physical address */
++ 0x87100000, /* ADDRDSPVIRT : DSP virtual address */
+ (Uint32) -1, /* ADDRGPPVIRT : GPP virtual address (if known) */
+ 0x00000080, /* SIZE : Size of the memory region */
+ FALSE /* SHARED : Shared access memory? */
+@@ -120,10 +120,10 @@
+ {
+ 3, /* ENTRY : Entry number */
+ "DDR", /* NAME : Name of the memory region */
+- 0x8FF00080, /* ADDRPHYS : Physical address */
+- 0x8FF00080, /* ADDRDSPVIRT : DSP virtual address */
++ 0x87100080, /* ADDRPHYS : Physical address */
++ 0x87100080, /* ADDRDSPVIRT : DSP virtual address */
+ (Uint32) -1, /* ADDRGPPVIRT : GPP virtual address (if known) */
+- 0xFFF80, /* SIZE : Size of the memory region */
++ 0xEFFF80, /* SIZE : Size of the memory region */
+ FALSE /* SHARED : Shared access memory? */
+ },
+ {
+diff -Nurd dsplink_1_50/dsplink/dsp/inc/DspBios/Davinci/DM6446/dsplink-davinci-base.tci dsplink_1_50.work/dsplink/dsp/inc/DspBios/Davinci/DM6446/dsplink-davinci-base.tci
+--- dsplink_1_50/dsplink/dsp/inc/DspBios/Davinci/DM6446/dsplink-davinci-base.tci 2007-12-03 08:11:55.000000000 -0500
++++ dsplink_1_50.work/dsplink/dsp/inc/DspBios/Davinci/DM6446/dsplink-davinci-base.tci 2008-07-29 16:56:03.000000000 -0400
+@@ -54,7 +54,10 @@
+ prog.module("GBL").C64PLUSCONFIGURE = true ;
+ prog.module("GBL").C64PLUSL2CFG = "32k" ;
+ prog.module("GBL").C64PLUSL1DCFG = "32k" ;
++prog.module("GBL").C64PLUSMAR128to159 = 0xFFFFFFFF ;
++/*
+ prog.module("GBL").C64PLUSMAR128to159 = 0x00008000 ;
++*/
+
+ /* ============================================================================
+ * MEM
+@@ -67,7 +70,7 @@
+ * ============================================================================
+ */
+ var DSPLINKMEM = prog.module("MEM").create("DSPLINKMEM");
+-DSPLINKMEM.base = 0x8FE00000;
++DSPLINKMEM.base = 0x87000000;
+ DSPLINKMEM.len = 0x100000;
+ DSPLINKMEM.createHeap = false;
+ DSPLINKMEM.comment = "DSPLINKMEM";
+@@ -77,7 +80,7 @@
+ * ============================================================================
+ */
+ var RESET_VECTOR = prog.module("MEM").create("RESET_VECTOR");
+-RESET_VECTOR.base = 0x8FF00000;
++RESET_VECTOR.base = 0x87100000;
+ RESET_VECTOR.len = 0x00000080;
+ RESET_VECTOR.space = "code/data";
+ RESET_VECTOR.createHeap = false;
+@@ -88,8 +91,8 @@
+ * ============================================================================
+ */
+ var DDR = prog.module("MEM").create("DDR");
+-DDR.base = 0x8FF00080;
+-DDR.len = 0x000FFF80;
++DDR.base = 0x87100080;
++DDR.len = 0xEFFF80;
+ DDR.space = "code/data";
+ DDR.createHeap = true;
+ DDR.heapSize = 0x10000;
============================================================
--- conf/machine/davinci-dvevm.conf b12fca91f474fdad55b2f5419ce9fc3dbbff3621
+++ conf/machine/davinci-dvevm.conf 7c257968d897ceecb506bc50b6e83ccf5e740b91
@@ -11,7 +11,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET
PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_VERSION_u-boot = "1.3.2"
+#PREFERRED_VERSION_u-boot = "1.3.2"
UBOOT_MACHINE = "davinci_dvevm_config"
UBOOT_ENTRYPOINT="0x80008000"
============================================================
--- packages/dsplink/dsplink.inc 9e699e8d88270170f89287867ca77b32b4229d03
+++ packages/dsplink/dsplink.inc 6da19209ce466c39c415f57e67acc29ab812f470
@@ -116,9 +116,25 @@ do_install () {
cp ${S}/gpp/BUILD/EXPORT/RELEASE/dsplinkk.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/dsp/
install -d ${D}/${bindir}
- install ${S}/gpp/BUILD/EXPORT/RELEASE/mpcsxfergpp ${D}/${bindir}
- install ${S}/gpp/BUILD/EXPORT/RELEASE/ringiogpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/loopgpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/messagegpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/messagemultigpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/mpcsxfergpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/mplistgpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/readwritegpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/ringiogpp ${D}/${bindir}
+ install ${S}/gpp/BUILD/EXPORT/RELEASE/scalegpp ${D}/${bindir}
+ install -d ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/loop.out ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/messagemulti.out ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/message.out ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/mpcsxfer.out ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/mplist.out ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/readwrite.out ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/ringio.out ${D}/${datadir}/dsplink
+ install ${S}/dsp/BUILD/EXPORT/RELEASE/scale.out ${D}/${datadir}/dsplink
+
install -d ${D}/${libdir}
install -m 0755 ${S}/gpp/BUILD/EXPORT/RELEASE/dsplink.lib ${D}/${libdir}
}
@@ -143,7 +159,8 @@ FILES_${PN}-module = "${sysconfdir} /li
PACKAGES =+ "${PN}-module"
FILES_${PN}-module = "${sysconfdir} /lib/modules"
-FILES_${PN} = "${bindir}/mpcsxfergpp ${bindir}/ringiogpp"
+FILES_${PN} = "${bindir}/* ${datadir}/dsplink/*"
+
INHIBIT_PACKAGE_STRIP = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/dsplink/dsplink_1.50.bb 7c50fa88c27a143ecaffccf1adaa106fad6cf643
+++ packages/dsplink/dsplink_1.50.bb 0de167bdd761e3c8b3fb707da0f0c1d1b048402b
@@ -15,6 +15,10 @@ SRC_URI = "http://install.tarball.in.sou
file://prcs-fix-include.patch;patch=1;pnum=2 \
"
+SRC_URI_append_davinci-sffsdr = " \
+ file://dsplink-128M.patch;patch=1;pnum=2 \
+"
+
S = "${WORKDIR}/dsplink_1_50/dsplink"
============================================================
--- packages/dsplink/files/CURRENTCFG.MK 2d8b0fa316342698cd5493798d1c74ccda6f34fa
+++ packages/dsplink/files/CURRENTCFG.MK 93c29fea0e4eba38148bcebf77b7dc135e72a6a9
@@ -59,30 +59,30 @@ export USE_RINGIO := 1
export USE_NOTIFY := 1
export USE_MPCS := 1
export USE_RINGIO := 1
-export USE_MPLIST := 0
-export USE_MSGQ := 0
-export USE_CHNL := 0
+export USE_MPLIST := 1
+export USE_MSGQ := 1
+export USE_CHNL := 1
# =========================================================
# Compile time physical link scalability options for device
# =========================================================
-export USE_CHNL_ZCPY_LINK := 0
+export USE_CHNL_ZCPY_LINK := 1
export USE_CHNL_PCPY_LINK := 0
-export USE_MSGQ_ZCPY_LINK := 0
+export USE_MSGQ_ZCPY_LINK := 1
export USE_MSGQ_PCPY_LINK := 0
# =========================================================
# Enable/ Disable trace
# =========================================================
-export TRACE := 1
+export TRACE := 0
# =========================================================
# Enable/ Disable profiling
# =========================================================
-export PROFILE := 1
+export PROFILE := 0
# =========================================================
============================================================
--- packages/linux/linux-davinci_2.6.x+git-davinci.bb 66de65e75200c4c93b249df7c4c2149d952f85b5
+++ packages/linux/linux-davinci_2.6.x+git-davinci.bb 08ffdd8f902b532c93f402c9a38c62540680bfd7
@@ -3,12 +3,12 @@ require linux-omap.inc
# uncomment the below to get the latest and greatest and avoid a full reparse
# or override in it local.conf like this: DAVINCI_SRCREV_pn-linux-davinci = "${@bb.fetch.get_srcrev(d)}"
#DAVINCI_SRCREV = "${@bb.fetch.get_srcrev(d)}"
-DAVINCI_SRCREV ?= "e23e6d5c446074082d93285f21cf95ed0d537a6f"
+DAVINCI_SRCREV ?= "f5691bc8f65a08a6cb9900a5c7099a36b2b9b7a7"
SRCREV = "${DAVINCI_SRCREV}"
PV = "2.6.25"
#PV = "2.6.25+2.6.26-rc0+git${SRCREV}"
-PR = "r1"
+PR = "r2"
COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)"
#
# mt diff -reb28dc45b262f9456efc6bd50fbcf80645179f8f -r358ebca4871137902f5525b721deee3b5a7b73ec
#
#
#
# rename "packages/mozilla/firefox-3.0"
# to "packages/mozilla/firefox-3.0.1"
#
# rename "packages/mozilla/firefox_3.0.bb"
# to "packages/mozilla/firefox_3.0.1.bb"
#
# add_file "packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch"
# content [67358daefda5443aa9a8a51de82b34c59d55a57d]
#
# add_file "packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch"
# content [f227665cd13dd712c7309a402da4b72121a5effd]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e]
# to [840f016202d28dd7d52f92202a9c81d4c69a4e4d]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [78d0391ecaae3f48ad1d0e048b2e3d7601118d7e]
# to [e3046b95c386745454ecdf90ff6eed7e7cea6039]
#
# patch "packages/ffmpeg/omapfbplay_git.bb"
# from [dfca330567472a5564849f47415794ee946785dd]
# to [4649b54f81c86dc3f8fa7324ed4a5b8ccc3d764c]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [560914bc9a5ea2d1a400c348659a241349d2640d]
# to [5dcf73d1dc04bac818a527f9cc2fe572619f8d29]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [ef14668a9a1c7d97225d194c81aa52ace025f767]
# to [d1968e8ba7639627d6db87ba953b800c24ef27ea]
#
# patch "packages/mozilla/firefox-3.0.1/mozconfig"
# from [f83ff32cfbbf829044318c7e97590355bcb0c2f5]
# to [2704adff3ffa3175691de0aa03a89add1e4c3169]
#
# patch "packages/mozilla/firefox_3.0.1.bb"
# from [942349cd9030dc2bc32724443e1a198f0b019c3e]
# to [3cc3084dbdb8556bcde37d7a6be2f522197a3431]
#
# patch "packages/mythtv/mythtv_0.21.bb"
# from [590a51ee6de14a40660a5ab607d88ecb36aaa2ff]
# to [11c9903ba5a2d62b47e984d6c45a432010f6bbab]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch 67358daefda5443aa9a8a51de82b34c59d55a57d
+++ packages/linux/linux-omap2-git/beagleboard/no-cortex-deadlock.patch 67358daefda5443aa9a8a51de82b34c59d55a57d
@@ -0,0 +1,75 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Wed, 30 Jul 2008 08:25:51 +0000 (+0100)
+Subject: ARM: NEON L1 cache bug workaround (erratum 451034)
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=26023493baf13e0a67fd6cf08d87be5ff6f7c56d
+
+ARM: NEON L1 cache bug workaround (erratum 451034)
+
+On Cortex-A8 r1p0 and r1p1, executing a NEON store with an integer
+store in the store buffer, can cause a processor deadlock under
+certain conditions.
+
+Executing a DMB instruction before saving NEON/VFP registers and before
+return to userspace makes it safe to run code which includes similar
+counter-measures. Userspace code can still trigger the deadlock, so
+a different workaround is required to safely run untrusted code.
+
+See ARM Cortex-A8 Errata Notice (PR120-PRDC-008070) for full details.
+---
+
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 8c75840..1172e14 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -1071,6 +1071,22 @@ config NEON
+ Say Y to include support code for NEON, the ARMv7 Advanced SIMD
+ Extension.
+
++config NEON_CACHE_BUG
++ bool "NEON L1 cache bug workaround (erratum 451034)"
++ depends on VFPv3
++ help
++ On Cortex-A8 r1p0 and r1p1, executing a NEON store with an integer
++ store in the store buffer, can cause a processor deadlock under
++ certain conditions.
++
++ See ARM Cortex-A8 Errata Notice (PR120-PRDC-008070) for full details.
++
++ Say Y to include a workaround.
++
++ WARNING: Even with this option enabled, userspace code can trigger
++ the deadlock. To safely run untrusted code, a different fix is
++ required.
++
+ endmenu
+
+ menu "Userspace binary formats"
+diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
+index 597ed00..e50094e 100644
+--- a/arch/arm/kernel/entry-common.S
++++ b/arch/arm/kernel/entry-common.S
+@@ -68,6 +68,10 @@ no_work_pending:
+ /* perform architecture specific actions before user return */
+ arch_ret_to_user r1, lr
+
++#ifdef CONFIG_NEON_CACHE_BUG
++ dmb
++#endif
++
+ @ slow_restore_user_regs
+ ldr r1, [sp, #S_PSR] @ get calling cpsr
+ ldr lr, [sp, #S_PC]! @ get pc
+diff --git a/include/asm-arm/vfpmacros.h b/include/asm-arm/vfpmacros.h
+index cccb389..c9d2976 100644
+--- a/include/asm-arm/vfpmacros.h
++++ b/include/asm-arm/vfpmacros.h
+@@ -32,6 +32,9 @@
+
+ @ write all the working registers out of the VFP
+ .macro VFPFSTMIA, base, tmp
++#ifdef CONFIG_NEON_CACHE_BUG
++ dmb
++#endif
+ #if __LINUX_ARM_ARCH__ < 6
+ STC p11, cr0, [\base],#33*4 @ FSTMIAX \base!, {d0-d15}
+ #else
============================================================
--- packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch f227665cd13dd712c7309a402da4b72121a5effd
+++ packages/mythtv/mythtv-0.21/no-cortex-deadlock.patch f227665cd13dd712c7309a402da4b72121a5effd
@@ -0,0 +1,115 @@
+From: Mans Rullgard <mans at mansr.com>
+Date: Tue, 29 Jul 2008 21:13:14 +0000 (+0100)
+Subject: ARM: work around Cortex-A8 erratum 451034
+X-Git-Url: http://git.mansr.com/?p=ffmpeg.mru;a=commitdiff_plain;h=c6bbb0c33f6f681b8265a43f8744735de5a9d45e
+
+ARM: work around Cortex-A8 erratum 451034
+
+On Cortex-A8 r1p0 and r1p1, executing a NEON store with an integer
+store in the store buffer, can cause a processor deadlock under
+certain conditions.
+
+A DMB instruction at the start of every NEON function ensures that
+the integer store buffer is always empty before executing any NEON
+store, thus avoiding the deadlock condition.
+
+See ARM Cortex-A8 Errata Notice (PR120-PRDC-008070) for full details.
+---
+
+diff --git b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c
+index fa0602d..4fbadfc 100644
+--- b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c
++++ b/mythtv/libs/libavcodec/armv4l/dsputil_neon.c
+@@ -28,6 +28,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ int h, int x, int y);
+
+ #define PUT_PIXELS_16_X2(vhadd) \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "vld1.64 {d0,d1,d2}, [%[p]], %[line_size] \n\t" \
+ "vld1.64 {d4,d5,d6}, [%[p]], %[line_size] \n\t" \
+@@ -46,6 +47,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "lsl %[l2], %[line_size], #1 \n\t" \
+ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \
+ "vld1.64 {d2,d3}, [%[p1]], %[l2] \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ vhadd".u8 q2, q0, q1 \n\t" \
+@@ -69,6 +71,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "vaddl.u8 q10, d1, d3 \n\t" \
+ "vaddl.u8 q9, d4, d6 \n\t" \
+ "vaddl.u8 q11, d5, d7 \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ "vld1.64 {d0,d1,d2}, [%[p0]], %[l2] \n\t" \
+@@ -98,6 +101,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "bgt 1b \n\t"
+
+ #define PUT_PIXELS_8_X2(vhadd) \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "vld1.64 {d0,d1}, [%[p]], %[line_size] \n\t" \
+ "vld1.64 {d2,d3}, [%[p]], %[line_size] \n\t" \
+@@ -116,6 +120,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "lsl %[l2], %[line_size], #1 \n\t" \
+ "vld1.64 {d0}, [%[p0]], %[l2] \n\t" \
+ "vld1.64 {d1}, [%[p1]], %[l2] \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ vhadd".u8 d4, d0, d1 \n\t" \
+@@ -137,6 +142,7 @@ extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
+ "vext.8 d6, d2, d3, #1 \n\t" \
+ "vaddl.u8 q8, d0, d4 \n\t" \
+ "vaddl.u8 q9, d2, d6 \n\t" \
++ "dmb \n\t" \
+ "1: \n\t" \
+ "subs %[h], %[h], #2 \n\t" \
+ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \
+@@ -161,6 +167,7 @@ static void put_pixels16_neon(uint8_t *block, const uint8_t *pixels,
+ int line_size, int h)
+ {
+ asm volatile(
++ "dmb \n\t"
+ "1: \n\t"
+ "vld1.64 {d0,d1}, [%[pixels]], %[line_size] \n\t"
+ "vld1.64 {d2,d3}, [%[pixels]], %[line_size] \n\t"
+@@ -224,6 +231,7 @@ static void put_pixels8_neon(uint8_t *block, const uint8_t *pixels,
+ int line_size, int h)
+ {
+ asm volatile(
++ "dmb \n\t"
+ "1: \n\t"
+ "vld1.64 {d0}, [%[p]], %[line_size] \n\t"
+ "vld1.64 {d1}, [%[p]], %[line_size] \n\t"
+diff --git b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S
+index a766867..8171ee2 100644
+--- b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S
++++ b/mythtv/libs/libavcodec/armv4l/h264dsp_neon.S
+@@ -40,6 +40,8 @@ ff_put_h264_chroma_mc8_neon:
+ sub r4, r4, r5, lsl #3
+ add r4, r4, #64
+
++ dmb
++
+ beq 2f
+
+ add r5, r1, r2
+diff --git b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S
+index 943e04f..abda6b2 100644
+--- b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S
++++ b/mythtv/libs/libavcodec/armv4l/simple_idct_neon.S
+@@ -307,9 +307,10 @@ idct_col4_st8:
+ const: .short W1, W2, W3, W4, W5, W6, W7, W4c
+
+ .macro idct_start data
++ push {v1-v3, lr}
+ pld [\data]
+ pld [\data, #64]
+- push {v1-v3, lr}
++ dmb
+ vpush {d8-d15}
+ adr a4, const
+ vld1.64 {d0,d1}, [a4,:128]
============================================================
--- conf/distro/include/sane-srcrevs.inc dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e
+++ conf/distro/include/sane-srcrevs.inc 840f016202d28dd7d52f92202a9c81d4c69a4e4d
@@ -37,19 +37,19 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "0c2b55d857ac1e62c1c8538b86c0d8d62a80ccd6"
+SRCREV_pn-frameworkd ?= "f4e22aeeeeab16eee5f13151f184da4f899d7ff1"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
+SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039"
SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "134"
-SRCREV_pn-illume-theme-asu ?= "134"
-SRCREV_pn-illume-theme-freesmartphone ?= "8128497ad1260202c6ebfb08c11a2253bf81665b"
+SRCREV_pn-illume ?= "170"
+SRCREV_pn-illume-theme-asu ?= "170"
+SRCREV_pn-illume-theme-freesmartphone ?= "5cdedae0e45911ef10f6966587e7f3e842b5d2bd"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
@@ -71,8 +71,8 @@ SRCREV_pn-linux-ixp4xx ?= "1066"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "5ccaca2adb1c37b5955a4733f68ae08a755e3d78"
-SRCREV_pn-linux-openmoko-devel ?= "9c058ff0d2641df3c36fc3300acb72078d2c41d4"
+SRCREV_pn-linux-openmoko ?= "d4b28ec4e2818207cc0e48b90dbce581e0b779e7"
+SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
@@ -81,8 +81,8 @@ SRCREV_pn-matchbox-stroke ?= "1820"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "5cf2a90d86601b2666b4634784853fb51d0d5896"
-SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
+SRCREV_pn-mickeydbus ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
+SRCREV_pn-mickeyterm ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer ?= "27047"
@@ -159,7 +159,7 @@ SRCREV_pn-python-lightmediascanner = "68
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
+SRCREV_pn-python-pyrtc = "7284c178a66c9fa5b09c658560d26d3f976a79f3"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "2006"
@@ -178,4 +178,4 @@ SRCREV_pn-xserver-kdrive-glamo ?= "a5136
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
+SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc"
-SRCREV_pn-zhone ?= "900105c27bd176fdca4e8f896b2c8221181491de"
============================================================
--- packages/ffmpeg/ffmpeg_git.bb 78d0391ecaae3f48ad1d0e048b2e3d7601118d7e
+++ packages/ffmpeg/ffmpeg_git.bb e3046b95c386745454ecdf90ff6eed7e7cea6039
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r17"
+PR = "r18"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ SRCREV = "3692b8de9fae73860be636606cb634
FFBRANCH ?= "master"
SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "32fb69d610d0f9136bb4f827b42600a819f96f00"
+SRCREV_arm = "c6bbb0c33f6f681b8265a43f8744735de5a9d45e"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
============================================================
--- packages/ffmpeg/omapfbplay_git.bb dfca330567472a5564849f47415794ee946785dd
+++ packages/ffmpeg/omapfbplay_git.bb 4649b54f81c86dc3f8fa7324ed4a5b8ccc3d764c
@@ -2,7 +2,7 @@ LICENSE = "MIT"
DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
LICENSE = "MIT"
-PR = "r6"
+PR = "r8"
inherit module-base
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig 560914bc9a5ea2d1a400c348659a241349d2640d
+++ packages/linux/linux-omap2-git/beagleboard/defconfig 5dcf73d1dc04bac818a527f9cc2fe572619f8d29
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.26-rc9-omap1
-# Tue Jul 8 15:36:02 2008
+# Linux kernel version: 2.6.26-omap1
+# Wed Jul 30 14:28:15 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -331,6 +331,7 @@ CONFIG_NEON=y
CONFIG_VFP=y
CONFIG_VFPv3=y
CONFIG_NEON=y
+CONFIG_NEON_CACHE_BUG=y
#
# Userspace binary formats
@@ -1406,9 +1407,7 @@ CONFIG_USB_MUSB_HDRC_HCD=y
CONFIG_USB_MUSB_OTG=y
CONFIG_USB_GADGET_MUSB_HDRC=y
CONFIG_USB_MUSB_HDRC_HCD=y
-# CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_USB_INVENTRA_DMA=y
-# CONFIG_USB_TI_CPPI_DMA is not set
+CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_MUSB_LOGLEVEL=0
#
============================================================
--- packages/linux/linux-omap2_git.bb ef14668a9a1c7d97225d194c81aa52ace025f767
+++ packages/linux/linux-omap2_git.bb d1968e8ba7639627d6db87ba953b800c24ef27ea
@@ -5,8 +5,8 @@ PV = "2.6.26"
SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
PV = "2.6.26"
-#PV = "2%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list