commit 7fb3e7a2d64b902e423c9e5a3aedc1f4179ac27d
author Andre Schwarz <andre.schwarz@matrix-vision.de> Thu Apr 14 15:11:44 2011 +0200
committer Kim Phillips <kim.phillips@freescale.com> Wed Jul 06 19:09:27 2011 -0500
tree e157619fc227084ae6b6cb3d0e80e274bde571bf
parent 03c0a9244098e02a3d076418d6a23a3abd117ad9

mpc83xx: Add support for MergerBox board

Includes board config file, documentation, maintainer and boards.cfg
entries, and board specific files in vendor dir.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

boards.cfg

diff --git a/boards.cfg b/boards.cfg
index 6ece5df..e682f76 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -518,6 +518,7 @@
 MPC837XEMDS_HOST             powerpc     mpc83xx     mpc837xemds         freescale      -           MPC837XEMDS:PCI
 MPC837XERDB                  powerpc     mpc83xx     mpc837xerdb         freescale
 kmeter1                      powerpc     mpc83xx     km83xx              keymile
+MERGERBOX                    powerpc     mpc83xx     mergerbox           matrix_vision
 MVBLM7                       powerpc     mpc83xx     mvblm7              matrix_vision
 SIMPC8313_LP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_LP
 SIMPC8313_SP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_SP