[oe-commits] org.oe.dev linux-omap2 git: sync with sakomans tree and drop unused patches

[koen commit]

linux-omap2 git: sync with sakomans tree and drop unused patches

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b6c0786ab5d67f257974d8b40c940fcb2be0b6e8
ViewMTN: http://monotone.openembedded.org/revision/info/b6c0786ab5d67f257974d8b40c940fcb2be0b6e8
Files:
1
packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch
packages/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch
packages/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r3b3faee353d8023cc4c13c58aa4be9eaf82704d5 -rb6c0786ab5d67f257974d8b40c940fcb2be0b6e8
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/fix-dispc-clocks.patch"
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch"
#  content [99ffef3f530d6c960ed9d74f0993325b3d153424]
# 
# add_file "packages/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch"
#  content [99ffef3f530d6c960ed9d74f0993325b3d153424]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [6ced9351a9e9bfb0809ec690f20fa266e2d928e1]
#    to [10ec409e4f0031504b4d5533955918e57fbe0f74]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch	99ffef3f530d6c960ed9d74f0993325b3d153424
+++ packages/linux/linux-omap2-git/beagleboard/no-empty-flash-warnings.patch	99ffef3f530d6c960ed9d74f0993325b3d153424
@@ -0,0 +1,15 @@
+diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
+index 1d437de..33b3feb 100644
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -647,8 +647,8 @@ scan_more:
+ 			inbuf_ofs = ofs - buf_ofs;
+ 			while (inbuf_ofs < scan_end) {
+ 				if (unlikely(*(uint32_t *)(&buf[inbuf_ofs]) != 0xffffffff)) {
+-					printk(KERN_WARNING "Empty flash at 0x%08x ends at 0x%08x\n",
+-					       empty_start, ofs);
++//					printk(KERN_WARNING "Empty flash at 0x%08x ends at 0x%08x\n",
++//					       empty_start, ofs);
+ 					if ((err = jffs2_scan_dirty_space(c, jeb, ofs-empty_start)))
+ 						return err;
+ 					goto scan_more;
============================================================
--- packages/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch	99ffef3f530d6c960ed9d74f0993325b3d153424
+++ packages/linux/linux-omap2-git/omap3evm/no-empty-flash-warnings.patch	99ffef3f530d6c960ed9d74f0993325b3d153424
@@ -0,0 +1,15 @@
+diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
+index 1d437de..33b3feb 100644
+--- a/fs/jffs2/scan.c
++++ b/fs/jffs2/scan.c
+@@ -647,8 +647,8 @@ scan_more:
+ 			inbuf_ofs = ofs - buf_ofs;
+ 			while (inbuf_ofs < scan_end) {
+ 				if (unlikely(*(uint32_t *)(&buf[inbuf_ofs]) != 0xffffffff)) {
+-					printk(KERN_WARNING "Empty flash at 0x%08x ends at 0x%08x\n",
+-					       empty_start, ofs);
++//					printk(KERN_WARNING "Empty flash at 0x%08x ends at 0x%08x\n",
++//					       empty_start, ofs);
+ 					if ((err = jffs2_scan_dirty_space(c, jeb, ofs-empty_start)))
+ 						return err;
+ 					goto scan_more;
============================================================
--- packages/linux/linux-omap2_git.bb	6ced9351a9e9bfb0809ec690f20fa266e2d928e1
+++ packages/linux/linux-omap2_git.bb	10ec409e4f0031504b4d5533955918e57fbe0f74
@@ -5,9 +5,8 @@ PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCRE
 SRCREV = "050684c18f2ea0b08fdd5233a0cd3c7f96e00a0e"
 
 PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
-PR = "r35"
+PR = "r36"
 
-
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
 
@@ -19,6 +18,7 @@ SRC_URI_append_beagleboard = " file://no
            file://timer-suppression.patch;patch=1 \
            file://soc.patch;patch=1 \
            file://16bpp.patch;patch=1 \
+           file://no-empty-flash-warnings.patch;patch=1 \
            file://logo_linux_clut224.ppm \
 "
 
@@ -26,6 +26,10 @@ SRC_URI_append_omap3evm = " file://no-ha
            file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
            file://0001-omap3-cpuidle.patch;patch=1 \
            file://0002-omap3-cpuidle.patch;patch=1 \
+           file://timer-suppression.patch;patch=1 \
+           file://soc.patch;patch=1 \
+           file://no-empty-flash-warnings.patch;patch=1 \
+           file://touchscreen.patch;patch=1 \
 "