summaryrefslogtreecommitdiff
path: root/include/configs/MERGERBOX.h
Commit message (Collapse)AuthorAgeLines
* COMMON: Use __stringify() instead of MK_STR()Marek Vasut2012-10-15-15/+9
| | | | | | | | | Kill multiple occurances and redeclaration of MK_STR in favor of __stringify(). Signed-off-by: Marek Vasut <marex@denx.de> Cc: Wolfgang Denk <wd@denx.de> Signed-off-by: Tom Rini <trini@ti.com>
* hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.cTom Rini2012-06-20-1/+0
| | | | | | | | | | Exactly one board has defined CONFIG_SYS_PROMPT_HUSH_PS2 to a value different than "> " which is vision2. I have Cc'd the maintainer here as I strongly suspect this is a bug rather than intentional behavior. Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Stefano Babic <sbabic@denx.de>
* mpc83xx: Cleanup usage of LBC constantsJoe Hershberger2011-11-03-6/+8
| | | | | | Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* mpc83xx: Cleanup usage of BAT constantsJoe Hershberger2011-11-03-7/+7
| | | | | | Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* mpc83xx: cosmetic: MERGERBOX.h checkpatch complianceJoe Hershberger2011-11-03-6/+6
| | | | | | Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
* board configs: drop NET_MULTI referencesMike Frysinger2011-10-05-1/+0
| | | | | | | Now that none of the core checks CONFIG_NET_MULTI, there's not much point in boards defining it. So scrub all references to it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* mpc83xx: Add support for MergerBox boardAndre Schwarz2011-07-06-0/+619
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>