On Mon, Nov 26, 2012 at 03:49:58PM -0600, Scott Wood wrote:

The following changes since commit 178d0cc1a4c73c3341afbeb2a93b172de8c96bd1:

Merge branch 'master' of git://git.denx.de/u-boot-video (2012-11-19 09:28:04 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-nand-flash.git master

for you to fetch changes up to 3287f6d3858faee768a7c47515bd21914ad591a2:

nand: Add torture feature (2012-11-26 15:41:29 -0600)

---

Beno?t Th?baudeau (3): nand: Clean up nand_util nand: Fix nand_erase_opts() offset check nand: Add torture feature

Joe Hershberger (1): nand: Move the sub-page read support enable to a flag

Jos? Miguel Gon?alves (1): Add u-boot-pad.bin target to the Makefile

Karl O. Pinc (1): README: Reference nand monitor commands in U-Boot README

Prabhakar Kushwaha (1): driver/mtd:IFC NAND:Initialise internal SRAM before any write

Scott Wood (22): serial/ns16550: don't build serial_ns16550 with MIN_FUNCTIONS serial/ns16550: wait for TEMT before initializing powerpc/mpc85xx: move debug tlb entry after TLB is in known state powerpc/mpc85xx: add comma before "already enabled" spl: rename u-boot-pad.bin to u-boot-with-spl.bin spl: introduce CONFIG_SPL_TARGET powerpc: change .fixup test to a GCC version test powerpc/mpc85xx: fix TLB alignment powerpc/mpc8xxx: move LAW code into arch/powerpc/cpu/mpc8xxx spl/mpc85xx: move udelay to cpu code spl: include resetvec and lib8xxx spl/mpc85xx: rename cpu_init_nand.c to spl_minimal.c powerpc/mpc85xx: consistently use COBJS-y spl/powerpc: introduce CONFIG_SPL_INIT_MINIMAL spl/85xx: new SPL support powerpc/mpc85xx/p1_p2_rdb_pc: new SPL support spl/nand: introduce CONFIG_SPL_NAND_DRIVERS, _BASE, and _ECC. spl/nand: config symbol documentation powerpc/mpc85xx/p1_p2_rdb_pc: convert from nand_spl to new spl powerpc/mpc85xx/p1_p2_rdb_pc: clean up memory map powerpc/mpc85xx/p2020rdb-pca: Use L2 SRAM for SPL boot nand/fsl: add NAND_NO_SUBPAGE_WRITE to eLBC and IFC drivers

Makefile | 22 ++- README | 45 ++++- arch/powerpc/config.mk | 5 + arch/powerpc/cpu/mpc85xx/Makefile | 38 ++-- arch/powerpc/cpu/mpc85xx/cpu.c | 3 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- .../cpu/mpc85xx/{cpu_init_nand.c => spl_minimal.c} | 19 +- arch/powerpc/cpu/mpc85xx/start.S | 123 ++++++------- arch/powerpc/cpu/mpc85xx/tlb.c | 4 +- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 87 +++++++++ arch/powerpc/cpu/mpc8xxx/Makefile | 17 ++ .../fsl_law.c => arch/powerpc/cpu/mpc8xxx/law.c | 11 +- arch/powerpc/lib/Makefile | 23 ++- board/freescale/p1_p2_rdb_pc/Makefile | 16 ++ board/freescale/p1_p2_rdb_pc/ddr.c | 2 + board/freescale/p1_p2_rdb_pc/law.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- .../freescale/p1_p2_rdb_pc/spl_minimal.c | 10 +- board/freescale/p1_p2_rdb_pc/tlb.c | 22 ++- common/cmd_nand.c | 22 +++ doc/README.mpc85xx | 2 +- doc/README.nand | 21 +++ drivers/misc/Makefile | 1 - drivers/mtd/nand/Makefile | 34 +++- drivers/mtd/nand/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/fsl_elbc_spl.c | 168 +++++++++++++++++ drivers/mtd/nand/fsl_ifc_nand.c | 64 ++++++- drivers/mtd/nand/nand_base.c | 9 +- drivers/mtd/nand/nand_util.c | 188 ++++++++++++++++---- drivers/serial/ns16550.c | 3 + drivers/serial/serial_ns16550.c | 4 + include/configs/am3517_crane.h | 3 + include/configs/am3517_evm.h | 3 + include/configs/cam_enc_4xx.h | 3 + include/configs/da850evm.h | 3 + include/configs/devkit8000.h | 3 + include/configs/hawkboard.h | 3 + include/configs/igep00x0.h | 3 + include/configs/mcx.h | 3 + include/configs/omap3_beagle.h | 3 + include/configs/omap3_evm.h | 3 + include/configs/omap3_evm_quick_nand.h | 3 + include/configs/omap3_overo.h | 3 + include/configs/p1_p2_rdb_pc.h | 137 +++++++------- include/configs/tam3517-common.h | 3 + include/configs/tricorder.h | 3 + include/linux/mtd/nand.h | 7 +- include/nand.h | 1 + nand_spl/board/freescale/common.c | 40 ----- nand_spl/board/freescale/mpc8536ds/Makefile | 10 +- nand_spl/board/freescale/mpc8569mds/Makefile | 10 +- nand_spl/board/freescale/mpc8572ds/Makefile | 10 +- nand_spl/board/freescale/p1010rdb/Makefile | 16 +- nand_spl/board/freescale/p1023rds/Makefile | 16 +- nand_spl/board/freescale/p1_p2_rdb/Makefile | 10 +- nand_spl/board/freescale/p1_p2_rdb_pc/Makefile | 146 --------------- spl/Makefile | 21 +++ 57 files changed, 980 insertions(+), 457 deletions(-) rename arch/powerpc/cpu/mpc85xx/{cpu_init_nand.c => spl_minimal.c} (76%) create mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds rename drivers/misc/fsl_law.c => arch/powerpc/cpu/mpc8xxx/law.c (95%) rename nand_spl/board/freescale/p1_p2_rdb_pc/nand_boot.c => board/freescale/p1_p2_rdb_pc/spl_minimal.c (94%) create mode 100644 drivers/mtd/nand/fsl_elbc_spl.c delete mode 100644 nand_spl/board/freescale/common.c delete mode 100644 nand_spl/board/freescale/p1_p2_rdb_pc/Makefile

Applied to u-boot/master, thanks!