tree 4ed0e63aaaad760e9494c1cb83e405e2ac7c07ed
parent 6e4c1da86e77576476b566977305ddd82f9e6b8c
parent 0990dc61787ec03b0ae7579a51e5eb661112f13f
author Wolfgang Denk <wd@denx.de> 1328994896 +0100
committer Wolfgang Denk <wd@denx.de> 1328994896 +0100

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  nand/fsl_elbc: Convert to self-init
  nand: Introduce CONFIG_SYS_NAND_SELF_INIT
  nand_spl: store ecc data on the stack
  mtd/nand: Add ONFI support for FSL NAND controller
  nand: make 1-bit software ECC configurable
  nand: Sanitize ONFI strings.
  nand: Merge changes to BBT from Linux nand driver
  nand: Merge changes from Linux nand driver
  nand: cleanup whitespace
  nand: Add more NAND types from Linux nand driver
  nand: Merge BCH code from Linux nand driver
  NAND: Remove additional (CONFIG_SYS)_NAND_MAX_CHIPS
  NAND: remove NAND_MAX_CHIPS definitions
  nand_spl_simple: store ecc data on the stack