Hi Tom,

On Mon, 10 Sep 2012 15:41:02 -0700, Tom Warren twarren.nvidia@gmail.com wrote:

Albert,

Please pull u-boot-tegra/master into ARM/master. ./MAKEALL -a arm is clean except for yaffs and ohci-hcd errors that were present before. Thanks!

The following changes since commit 057df193b40d31799d41d43bc832a972f658bfe4: Albert ARIBAUD (1): Merge remote-tracking branch 'u-boot-ti/master' into m

are available in the git repository at:

git://git.denx.de/u-boot-tegra master

Jim Lin (1): tegra: nand: Add Tegra NAND driver

Lucas Stach (1): tegra20: usb: rework set_host_mode

Simon Glass (5): nand: Try to align the default buffers tegra: Add NAND support to funcmux tegra: fdt: Add NAND controller binding and definitions tegra: fdt: Add NAND definitions to fdt tegra: Enable NAND on Seaboard

Stephen Warren (6): tegra: enable NAND on Harmony mmc: detect boot sectors using EXT_CSD_BOOT_MULT too env_mmc: allow environment to be in an eMMC partition tegra: put eMMC environment into the boot sectors ARM: tegra: remove redundant mkdirs from board Makefiles ARM: tegra: fix Ventana standalone build

Thierry Reding (2): cmd_nand: dump: Align data and OOB buffers tegra: Enable NAND on TEC

Tom Warren (2): Tegra: Change Tegra20 to Tegra in common code, prep for T30 NAND: MXS: include common.h first so cache.h is included in correct order

arch/arm/cpu/arm720t/tegra20/cpu.c | 8 +- arch/arm/cpu/armv7/tegra20/cmd_enterrcm.c | 2 +- arch/arm/cpu/armv7/tegra20/usb.c | 37 +- arch/arm/cpu/tegra20-common/Makefile | 2 +- arch/arm/cpu/tegra20-common/ap20.c | 6 +- arch/arm/cpu/tegra20-common/board.c | 14 +- arch/arm/cpu/tegra20-common/funcmux.c | 7 + arch/arm/cpu/tegra20-common/warmboot.c | 14 +- arch/arm/cpu/tegra20-common/warmboot_avp.c | 2 +- arch/arm/dts/tegra20.dtsi | 7 + arch/arm/include/asm/arch-tegra20/ap20.h | 3 - arch/arm/include/asm/arch-tegra20/funcmux.h | 3 + arch/arm/include/asm/arch-tegra20/mmc.h | 8 +- arch/arm/include/asm/arch-tegra20/sys_proto.h | 4 +- arch/arm/include/asm/arch-tegra20/tegra20.h | 13 +- .../arm/include/asm/arch-tegra20}/tegra_mmc.h | 12 +- arch/arm/include/asm/arch-tegra20/tegra_spi.h | 2 +- arch/arm/include/asm/arch-tegra20/timer.h | 4 +- board/avionic-design/common/tamonten.c | 2 +- board/avionic-design/dts/tegra20-tec.dts | 11 + board/compal/paz00/paz00.c | 4 +- board/compulab/trimslice/trimslice.c | 4 +- board/nvidia/common/board.c | 8 +- board/nvidia/dts/tegra20-harmony.dts | 10 + board/nvidia/dts/tegra20-seaboard.dts | 10 + board/nvidia/harmony/Makefile | 4 - board/nvidia/harmony/harmony.c | 4 +- board/nvidia/seaboard/Makefile | 4 - board/nvidia/seaboard/seaboard.c | 4 +- board/nvidia/ventana/Makefile | 4 +- board/nvidia/whistler/Makefile | 4 - board/nvidia/whistler/whistler.c | 4 +- common/cmd_nand.c | 4 +- common/env_mmc.c | 64 ++- .../nand/nvidia,tegra20-nand.txt | 53 + drivers/gpio/tegra_gpio.c | 8 +- drivers/i2c/tegra_i2c.c | 12 +- drivers/input/Makefile | 2 +- drivers/mmc/mmc.c | 3 +- drivers/mmc/tegra_mmc.c | 34 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/mxs_nand.c | 2 +- drivers/mtd/nand/nand_base.c | 3 +- drivers/mtd/nand/tegra_nand.c | 1026 ++++++++++++++++++++ drivers/mtd/nand/tegra_nand.h | 257 +++++ drivers/spi/tegra_spi.c | 6 +- include/configs/harmony.h | 19 +- include/configs/medcom.h | 6 +- include/configs/paz00.h | 9 +- include/configs/plutux.h | 6 +- include/configs/seaboard.h | 30 +- include/configs/tec.h | 18 +- .../{tegra20-common-post.h => tegra-common-post.h} | 12 +- include/configs/tegra20-common.h | 14 +- include/configs/trimslice.h | 8 +- include/configs/ventana.h | 9 +- include/configs/whistler.h | 11 +- include/fdtdec.h | 1 + include/linux/mtd/nand.h | 7 +- include/mmc.h | 1 + lib/fdtdec.c | 1 + 61 files changed, 1655 insertions(+), 197 deletions(-) rename {drivers/mmc => arch/arm/include/asm/arch-tegra20}/tegra_mmc.h (96%) create mode 100644 doc/device-tree-bindings/nand/nvidia,tegra20-nand.txt create mode 100644 drivers/mtd/nand/tegra_nand.c create mode 100644 drivers/mtd/nand/tegra_nand.h rename include/configs/{tegra20-common-post.h => tegra-common-post.h} (96%)

Applied to u-boot-arm/master, thanks!

Amicalement,