summaryrefslogtreecommitdiff
path: root/board/tqm5200/tqm5200.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@nyx.denx.de>2006-06-19 01:46:08 +0200
committerWolfgang Denk <wd@nyx.denx.de>2006-06-19 01:46:08 +0200
commit8d352247ecf3638cdd1ef7df31a6ad700bb80574 (patch)
treed8f2202361ce6cc944abb39195f66411003b0571 /board/tqm5200/tqm5200.c
parent9e18a4bc6cb512dc7ae3a6fc2ed912f71bd8c6c0 (diff)
parenta650cfa286e8933144a776693d56dfd858922aa4 (diff)
downloadu-boot-imx-8d352247ecf3638cdd1ef7df31a6ad700bb80574.zip
u-boot-imx-8d352247ecf3638cdd1ef7df31a6ad700bb80574.tar.gz
u-boot-imx-8d352247ecf3638cdd1ef7df31a6ad700bb80574.tar.bz2
Merge with ssh://atlas/home/wd/git/u-boot/work
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");