On Thu, Sep 20, 2012 at 01:18:21PM +0000, Jin Zhengxiong-R64188 wrote:

Hello Tom,

Please pull from u-boot-coldfire, thanks.

The following changes since commit 49b3962d2021867924f9fc04288f486abb501d87:

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx (2012-09-18 14:56:31 -0700)

are available in the git repository at:

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

Alison Wang (9): ColdFire: Rename NANDFLASH_SIZE into CONFIG_NANDFLASH_SIZE for MCF537x ColdFire: Update the bitops for ColdFire platform ColdFire: Add clear and set bits macros for ColdFire platform ColdFire: Clean up checkpatch warnings for MCF5227x ColdFire: Clean up checkpatch warnings for MCF52x2 ColdFire: Clean up checkpatch warnings for MCF532x/MCF537x/MCF5301x ColdFire: Clean up checkpatch warnings for MCF523x ColdFire: Clean up checkpatch warnings for MCF547x and MCF548x ColdFire: Clean up checkpatch warnings for MCF54451 and MCF54455

Jason Jin (1): Flex bus definition update for Coldfire 5253.

Richard Retanubun (1): ColdFire: Queued SPI driver

arch/m68k/cpu/mcf5227x/cpu.c | 13 +- arch/m68k/cpu/mcf5227x/cpu_init.c | 140 ++++++------ arch/m68k/cpu/mcf5227x/interrupts.c | 15 +- arch/m68k/cpu/mcf5227x/speed.c | 40 ++-- arch/m68k/cpu/mcf523x/cpu.c | 33 ++-- arch/m68k/cpu/mcf523x/cpu_init.c | 122 +++++----- arch/m68k/cpu/mcf523x/interrupts.c | 15 +- arch/m68k/cpu/mcf523x/speed.c | 10 +- arch/m68k/cpu/mcf52x2/cpu.c | 115 ++++++---- arch/m68k/cpu/mcf52x2/cpu_init.c | 267 ++++++++++++---------- arch/m68k/cpu/mcf52x2/interrupts.c | 40 ++-- arch/m68k/cpu/mcf52x2/speed.c | 19 +- arch/m68k/cpu/mcf532x/cpu.c | 33 ++-- arch/m68k/cpu/mcf532x/cpu_init.c | 304 +++++++++++++------------ arch/m68k/cpu/mcf532x/interrupts.c | 15 +- arch/m68k/cpu/mcf532x/speed.c | 77 ++++--- arch/m68k/cpu/mcf5445x/cpu.c | 13 +- arch/m68k/cpu/mcf5445x/cpu_init.c | 215 +++++++++--------- arch/m68k/cpu/mcf5445x/interrupts.c | 15 +- arch/m68k/cpu/mcf5445x/pci.c | 74 +++--- arch/m68k/cpu/mcf5445x/speed.c | 71 +++--- arch/m68k/cpu/mcf547x_8x/cpu.c | 38 ++-- arch/m68k/cpu/mcf547x_8x/cpu_init.c | 84 ++++---- arch/m68k/cpu/mcf547x_8x/interrupts.c | 15 +- arch/m68k/cpu/mcf547x_8x/pci.c | 59 +++--- arch/m68k/cpu/mcf547x_8x/slicetimer.c | 38 ++-- arch/m68k/include/asm/bitops.h | 59 +++--- arch/m68k/include/asm/coldfire/flexbus.h | 68 ++++++ arch/m68k/include/asm/coldfire/qspi.h | 2 +- arch/m68k/include/asm/io.h | 38 +++- arch/m68k/include/asm/m5271.h | 26 ++ board/freescale/m5208evbe/m5208evbe.c | 28 ++- board/freescale/m52277evb/m52277evb.c | 30 ++-- board/freescale/m5235evb/m5235evb.c | 43 ++-- board/freescale/m5253demo/m5253demo.c | 29 ++- board/freescale/m5253evbe/m5253evbe.c | 30 ++- board/freescale/m5272c3/m5272c3.c | 9 +- board/freescale/m5275evb/m5275evb.c | 50 +++-- board/freescale/m53017evb/m53017evb.c | 28 ++- board/freescale/m5329evb/m5329evb.c | 28 ++- board/freescale/m5329evb/nand.c | 14 +- board/freescale/m5373evb/m5373evb.c | 28 ++- board/freescale/m5373evb/nand.c | 18 +- board/freescale/m54451evb/m54451evb.c | 32 ++-- board/freescale/m54455evb/m54455evb.c | 90 ++++---- board/freescale/m547xevb/m547xevb.c | 34 ++-- board/freescale/m548xevb/m548xevb.c | 34 ++-- drivers/spi/Makefile | 1 + drivers/spi/cf_qspi.c | 373 ++++++++++++++++++++++++++++++ include/configs/M5373EVB.h | 10 +- 50 files changed, 1817 insertions(+), 1165 deletions(-) create mode 100644 drivers/spi/cf_qspi.c

Applied to u-boot/master, thanks! I've updated patchwork but please note that http://patchwork.ozlabs.org/patch/85127/ is still sitting outstanding and looks like it should be changed to Changes Requested. Thanks again!