From 009e36806b89a29141dbe28b170117f5330b06da Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 26 Jul 2014 12:23:56 +0000 Subject: kernel: remove kernel 3.6 kernel 3.6 is not used by any target any more, remove it. Signed-off-by: Hauke Mehrtens SVN-Revision: 41834 --- .../generic/patches-3.6/532-jffs2_eofdetect.patch | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 target/linux/generic/patches-3.6/532-jffs2_eofdetect.patch (limited to 'target/linux/generic/patches-3.6/532-jffs2_eofdetect.patch') diff --git a/target/linux/generic/patches-3.6/532-jffs2_eofdetect.patch b/target/linux/generic/patches-3.6/532-jffs2_eofdetect.patch deleted file mode 100644 index f36131e99f..0000000000 --- a/target/linux/generic/patches-3.6/532-jffs2_eofdetect.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/fs/jffs2/build.c -+++ b/fs/jffs2/build.c -@@ -114,6 +114,16 @@ static int jffs2_build_filesystem(struct - dbg_fsbuild("scanned flash completely\n"); - jffs2_dbg_dump_block_lists_nolock(c); - -+ if (c->flags & (1 << 7)) { -+ printk("%s(): unlocking the mtd device... ", __func__); -+ mtd_unlock(c->mtd, 0, c->mtd->size); -+ printk("done.\n"); -+ -+ printk("%s(): erasing all blocks after the end marker... ", __func__); -+ jffs2_erase_pending_blocks(c, -1); -+ printk("done.\n"); -+ } -+ - dbg_fsbuild("pass 1 starting\n"); - c->flags |= JFFS2_SB_FLAG_BUILDING; - /* Now scan the directory tree, increasing nlink according to every dirent found. */ ---- a/fs/jffs2/scan.c -+++ b/fs/jffs2/scan.c -@@ -148,8 +148,11 @@ int jffs2_scan_medium(struct jffs2_sb_in - /* reset summary info for next eraseblock scan */ - jffs2_sum_reset_collected(s); - -- ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset), -- buf_size, s); -+ if (c->flags & (1 << 7)) -+ ret = BLK_STATE_ALLFF; -+ else -+ ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb->offset), -+ buf_size, s); - - if (ret < 0) - goto out; -@@ -556,6 +559,17 @@ static int jffs2_scan_eraseblock (struct - return err; - } - -+ if ((buf[0] == 0xde) && -+ (buf[1] == 0xad) && -+ (buf[2] == 0xc0) && -+ (buf[3] == 0xde)) { -+ /* end of filesystem. erase everything after this point */ -+ printk("%s(): End of filesystem marker found at 0x%x\n", __func__, jeb->offset); -+ c->flags |= (1 << 7); -+ -+ return BLK_STATE_ALLFF; -+ } -+ - /* We temporarily use 'ofs' as a pointer into the buffer/jeb */ - ofs = 0; - max_ofs = EMPTY_SCAN_SIZE(c->sector_size); -- cgit v1.2.3