Message ID | 20110706192221.4497ca2d.kim.phillips@freescale.com |
---|---|
State | Accepted |
Delegated to: | Wolfgang Denk |
Headers | show |
Dear Kim Phillips, In message <20110706192221.4497ca2d.kim.phillips@freescale.com> you wrote: > Wolfgang Denk, > > Please pull new MergerBox board + minor fixes for 83xx for u-boot > v2011.09: > > The following changes since commit 79642098a8345e2506ab0ff02e8c7ac4da405d0c: > > Add support for Network Space v2 and parents (2011-07-04 10:55:28 +0200) > > are available in the git repository at: > git://git.denx.de/u-boot-mpc83xx.git master > > Andre Schwarz (4): > MPC837x: set i2c1_clk > MPC83xx: add define for global half-strength enable (HSE) > MPC83xx: add config options for memory setup. > mpc83xx: Add support for MergerBox board > > Bill Cook (1): > MPC83XX: Fix PCI express clock setup > > Ira W. Snyder (1): > fsl_dma: fix support for 83xx DMA engine > > Timur Tabi (1): > powerpc/83xx: remove empty board_early_init_f() > > MAINTAINERS | 1 + > arch/powerpc/cpu/mpc83xx/spd_sdram.c | 19 +- > arch/powerpc/cpu/mpc83xx/speed.c | 8 +- > board/freescale/mpc8323erdb/mpc8323erdb.c | 5 - > board/freescale/mpc8360erdk/mpc8360erdk.c | 5 - > board/matrix_vision/mergerbox/Makefile | 51 +++ > board/matrix_vision/mergerbox/fpga.c | 175 ++++++++ > board/matrix_vision/mergerbox/fpga.h | 30 ++ > board/matrix_vision/mergerbox/mergerbox.c | 241 +++++++++++ > board/matrix_vision/mergerbox/mergerbox.h | 67 +++ > board/matrix_vision/mergerbox/pci.c | 134 +++++++ > board/matrix_vision/mergerbox/sm107.c | 126 ++++++ > boards.cfg | 1 + > doc/README.mergerbox | 59 +++ > drivers/dma/fsl_dma.c | 2 + > include/configs/MERGERBOX.h | 619 +++++++++++++++++++++++++++++ > include/configs/MPC8323ERDB.h | 2 - > include/configs/MPC8360ERDK.h | 1 - > include/mpc83xx.h | 1 + > 19 files changed, 1531 insertions(+), 16 deletions(-) > create mode 100644 board/matrix_vision/mergerbox/Makefile > create mode 100644 board/matrix_vision/mergerbox/fpga.c > create mode 100644 board/matrix_vision/mergerbox/fpga.h > create mode 100644 board/matrix_vision/mergerbox/mergerbox.c > create mode 100644 board/matrix_vision/mergerbox/mergerbox.h > create mode 100644 board/matrix_vision/mergerbox/pci.c > create mode 100644 board/matrix_vision/mergerbox/sm107.c > create mode 100644 doc/README.mergerbox > create mode 100644 include/configs/MERGERBOX.h Applied, thanks. Best regards, Wolfgang Denk