summaryrefslogtreecommitdiff
path: root/board/tqm5200/tqm5200.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@atlas.denx.de>2006-06-19 01:37:03 +0200
committerWolfgang Denk <wd@atlas.denx.de>2006-06-19 01:37:03 +0200
commita650cfa286e8933144a776693d56dfd858922aa4 (patch)
tree1848c6ba3c8115b516d6711cad787d1e6a9d2fb5 /board/tqm5200/tqm5200.c
parentdf02bd1b3f2eecca04bfecb62eae7c2ff698506a (diff)
parent0c32d96ddd7309b86ff92dfc1f3694908f174cf6 (diff)
downloadu-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.zip
u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.gz
u-boot-imx-a650cfa286e8933144a776693d56dfd858922aa4.tar.bz2
Merge with ssh://fifi/home/wd/git/u-boot/master
Diffstat (limited to 'board/tqm5200/tqm5200.c')
-rw-r--r--board/tqm5200/tqm5200.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c
index 6aad920..310abd2 100644
--- a/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@ -254,13 +254,7 @@ int checkboard (void)
puts ("Board: AEVFIFO\n");
return 0;
#endif
-#if defined (CONFIG_TQM5200_AA)
- puts ("Board: TQM5200-AA (TQ-Components GmbH)\n");
-#elif defined (CONFIG_TQM5200_AB)
- puts ("Board: TQM5200-AB (TQ-Components GmbH)\n");
-#elif defined (CONFIG_TQM5200_AC)
- puts ("Board: TQM5200-AC (TQ-Components GmbH)\n");
-#elif defined (CONFIG_TQM5200)
+#if defined (CONFIG_TQM5200)
puts ("Board: TQM5200 (TQ-Components GmbH)\n");
#endif
#if defined (CONFIG_STK52XX)
@@ -572,17 +566,7 @@ static const SMI_REGS init_regs [] =
void video_get_info_str (int line_number, char *info)
{
if (line_number == 1) {
-#if defined (CONFIG_TQM5200_AA)
- strcpy (info, " Board: TQM5200-AA (TQ-Components GmbH)");
-#elif defined (CONFIG_TQM5200_AB)
- strcpy (info, " Board: TQM5200-AB (TQ-Components GmbH)");
-#elif defined (CONFIG_TQM5200_AC)
- strcpy (info, " Board: TQM5200-AC (TQ-Components GmbH)");
-#elif defined (CONFIG_TQM5200)
- strcpy (info, " Board: TQM5200 (TQ-Components GmbH)");
-#else
-#error No supported board selected
-#endif
+ strcpy (info, " Board: TQM5200 (TQ-Components GmbH)");
#if defined (CONFIG_STK52XX)
} else if (line_number == 2) {
strcpy (info, " on a STK52XX baseboard");