[U-Boot] [PATCH v1 0/2] mtd,ubi,ubifs: sync with v3.15

Heiko Schocher hs at denx.de
Tue Jul 15 16:08:41 CEST 2014


as Tom Rini suggested, I tried to update the mtd,ubi and ubifs
subsystem with linux v3.15:

commit 1860e379875dfe7271c649058aeddffe5afd9d0d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Sun Jun 8 11:19:54 2014 -0700

    Linux 3.15

First patch in this patchserie is a patch, which contains some
small changes based on the linux v3.14 patchserie [1]

Second patch is the real sync with linux v3.15 patch, based
on [1], created in the following way:

1) checkout linux v3.14 in the linux tree
2) copy all files [2] from the linux tree to the u-boot tree
3) "git diff" shows a patch, which contains all u-boot specific
   changes -> save it for later use
4) checkout linux v3.15 in the linux tree
5) copy all files [2] from the linux tree to the u-boot tree
6) "git diff" shows all linux specific changes between v3.14 and v3.15
7) apply u-boot specific changes patch from step 3
8) fix warnings, errors
9) compile (MAKEALL compiles clean for arm, powerpc and mips)
10) test, test, test (done on the imx6 based aristainetos board)
11) commit it, make patch and send to ML

[1] linux v3.14 sync
[U-Boot] [PATCH v5 0/5] mtd, ubi, ubifs: resync with Linux-3.14
http://lists.denx.de/pipermail/u-boot/2014-June/182501.html
Patchwork [U-Boot,v5,1/5] lib, rbtree: resync with Linux-3.14
http://patchwork.ozlabs.org/patch/363332/
Patchwork [U-Boot,v5,2/5] lib, list_sort: add list_sort from linux 3.14
http://patchwork.ozlabs.org/patch/363335/
Patchwork [U-Boot,v5,3/5] linux include: add ERR_CAST
http://patchwork.ozlabs.org/patch/363334/
Patchwork [U-Boot,v5,4/5] lib, linux: move linux specific defines to linux/compat.h
http://patchwork.ozlabs.org/patch/363333/
Patchwork [U-Boot,v5,5/5] mtd, ubi, ubifs: resync with Linux-3.14
http://patchwork.ozlabs.org/patch/363343/

[2] linux files used
drivers/mtd/mtdconcat.c
drivers/mtd/mtdcore.c
drivers/mtd/mtdpart.c
drivers/mtd/mtdcore.h
drivers/mtd/nand/nand_base.c
drivers/mtd/nand/nand_bbt.c
drivers/mtd/nand/nand_ids.c
drivers/mtd/ubi/attach.c
drivers/mtd/ubi/build.c
drivers/mtd/ubi/debug.c
drivers/mtd/ubi/debug.h
drivers/mtd/ubi/eba.c
drivers/mtd/ubi/fastmap.c
drivers/mtd/ubi/io.c
drivers/mtd/ubi/kapi.c
drivers/mtd/ubi/misc.c
drivers/mtd/ubi/ubi-media.h
drivers/mtd/ubi/ubi.h
drivers/mtd/ubi/upd.c
drivers/mtd/ubi/vmt.c
drivers/mtd/ubi/vtbl.c
drivers/mtd/ubi/wl.c
fs/ubifs/budget.c
fs/ubifs/debug.c
fs/ubifs/debug.h
fs/ubifs/io.c
fs/ubifs/key.h
fs/ubifs/log.c
fs/ubifs/lprops.c
fs/ubifs/lpt.c
fs/ubifs/lpt_commit.c
fs/ubifs/master.c
fs/ubifs/misc.h
fs/ubifs/orphan.c
fs/ubifs/recovery.c
fs/ubifs/replay.c
fs/ubifs/sb.c
fs/ubifs/scan.c
fs/ubifs/super.c
fs/ubifs/tnc.c
fs/ubifs/tnc_misc.c
fs/ubifs/ubifs-media.h
fs/ubifs/ubifs.h
include/linux/mtd/bbm.h
include/linux/mtd/flashchip.h
include/linux/mtd/mtd.h
include/linux/mtd/nand.h
include/linux/mtd/partitions.h
include/linux/mtd/ubi.h
include/uapi/mtd/mtd-abi.h
include/uapi/mtd/ubi-user.h

Cc: Scott Wood <scottwood at freescale.com>
Cc: Tom Rini <trini at ti.com>

Heiko Schocher (2):
  mtd,ubi,ubifs: update for the sync with linux v3.14
  mtd,ubi,ubifs: sync with linux v3.15

 drivers/mtd/mtdcore.c        |  26 +++++--
 drivers/mtd/mtdpart.c        |  16 ++--
 drivers/mtd/nand/nand_base.c | 174 +++++++++++++++++++++++++++++++++++--------
 drivers/mtd/nand/nand_ids.c  |   3 +
 drivers/mtd/ubi/build.c      |  11 +++
 drivers/mtd/ubi/ubi.h        |  21 +++++-
 drivers/mtd/ubi/wl.c         |   6 ++
 fs/ubifs/super.c             |  11 ++-
 include/linux/mtd/mtd.h      |  17 +++--
 include/linux/mtd/nand.h     | 113 +++++++++++++++++++++++++---
 include/mtd/ubi-user.h       |  22 ++++++
 11 files changed, 352 insertions(+), 68 deletions(-)

-- 
1.8.3.1



More information about the U-Boot mailing list