[U-Boot] Pull request: nand flash

[Tom Rini]

On Tue, Mar 04, 2014 at 08:09:19PM -0600, Scott Wood wrote:

> The following changes since commit eeb72e67619b98d2502fe634a3a5d9953de92ad0:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-02-26 16:49:58 -0500)
> 
> are available in the git repository at:
> 
> 
>   git://git.denx.de/u-boot-nand-flash.git master
> 
> for you to fetch changes up to 2eda892f00fbcf46143326f72e8ac5b472bd225a:
> 
>   mtd: nand: omap: move omap_elm.h from arch/arm/include/asm to drivers/mtd/nand (2014-03-04 17:23:54 -0600)
> 
> ----------------------------------------------------------------
> pekon gupta (9):
>       mtd: nand: omap: optimize chip->ecc.hwctl() for H/W ECC schemes
>       mtd: nand: omap: optimize chip->ecc.calculate() for H/W ECC schemes
>       mtd: nand: omap: optimized chip->ecc.correct() for H/W ECC schemes
>       board/ti/am335x/README: update for NAND boot
>       mtd: nand: omap: remove redundant platform specific header: arch-xx/omap_gpmc.h
>       mtd: nand: omap: remove unused #defines from common omap_gpmc.h
>       mtd: nand: omap: merge duplicate GPMC data from different arch-xx headers into common omap_gpmc.h
>       mtd: nand: omap: move omap_gpmc.h from arch/arm/include/asm to drivers/mtd/nand
>       mtd: nand: omap: move omap_elm.h from arch/arm/include/asm to drivers/mtd/nand
> 
>  arch/arm/include/asm/arch-am33xx/cpu.h             |  51 --
>  arch/arm/include/asm/arch-am33xx/omap_gpmc.h       |  48 --
>  arch/arm/include/asm/arch-am33xx/sys_proto.h       |   1 +
>  arch/arm/include/asm/arch-omap3/cpu.h              |  54 +-
>  arch/arm/include/asm/arch-omap3/mem.h              |  10 +
>  arch/arm/include/asm/arch-omap3/omap_gpmc.h        |  36 --
>  arch/arm/include/asm/arch-omap3/sys_proto.h        |   1 +
>  arch/arm/include/asm/arch-omap4/cpu.h              |  45 --
>  arch/arm/include/asm/arch-omap4/sys_proto.h        |   1 +
>  arch/arm/include/asm/arch-omap5/cpu.h              |  45 --
>  arch/arm/include/asm/arch-omap5/sys_proto.h        |   1 +
>  arch/arm/include/asm/omap_gpmc.h                   |  87 ----
>  board/isee/igep00x0/igep00x0.c                     |   1 -
>  board/overo/overo.c                                |   1 -
>  board/ti/am335x/README                             |  53 +-
>  drivers/mtd/nand/omap_elm.c                        |   6 +-
>  drivers/mtd/nand/omap_gpmc.c                       | 572 +++++++--------------
>  include/configs/am335x_evm.h                       |   1 -
>  include/configs/am335x_igep0033.h                  |   1 -
>  include/configs/am3517_crane.h                     |   1 -
>  include/configs/am3517_evm.h                       |   1 -
>  include/configs/cm_t35.h                           |   2 -
>  include/configs/devkit8000.h                       |   2 -
>  include/configs/dig297.h                           |   2 -
>  include/configs/mcx.h                              |   1 -
>  include/configs/omap3_beagle.h                     |   2 -
>  include/configs/omap3_evm_common.h                 |   1 -
>  include/configs/omap3_igep00x0.h                   |   1 -
>  include/configs/omap3_logic.h                      |   1 -
>  include/configs/omap3_overo.h                      |   2 -
>  include/configs/omap3_pandora.h                    |   2 -
>  include/configs/omap3_zoom1.h                      |   2 -
>  include/configs/siemens-am33x-common.h             |   1 -
>  include/configs/tam3517-common.h                   |   1 -
>  include/configs/tricorder.h                        |   2 -
>  .../include/asm => include/linux/mtd}/omap_elm.h   |   0
>  include/linux/mtd/omap_gpmc.h                      |  84 +++
>  37 files changed, 321 insertions(+), 802 deletions(-)
>  delete mode 100644 arch/arm/include/asm/arch-am33xx/omap_gpmc.h
>  delete mode 100644 arch/arm/include/asm/arch-omap3/omap_gpmc.h
>  delete mode 100644 arch/arm/include/asm/omap_gpmc.h
>  rename {arch/arm/include/asm => include/linux/mtd}/omap_elm.h (100%)
>  create mode 100644 include/linux/mtd/omap_gpmc.h

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140305/ac0576db/attachment.pgp>