From: Wolfgang Denk <wd@atlas.denx.de>
Date: Sun, 8 Oct 2006 23:07:53 +0000 (+0200)
Subject: TQM5200: perform POST memory test only on STK52xx carrier board.
X-Git-Tag: U-Boot-1_1_5~20
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1d92b2e550f5c069befe349a294238cee57959a9;p=u-boot

TQM5200: perform POST memory test only on STK52xx carrier board.
(and then only if PSC6_3 is read as "1" when booting).
Patch by Martin Krause, 21 Jun 2006
---

diff --git a/CHANGELOG b/CHANGELOG
index 1d879c4ff7..cc966ea975 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* TQM5200: perform POST memory test only on STK52xx carrier board.
+  (and then only if PSC6_3 is read as "1" when booting).
+  Patch by Martin Krause, 21 Jun 2006
+
 * Move "ar" flags to config.mk to allow for silent "make -s"
   Based on patch by Mike Frysinger, 20 Jun 2006
 
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c
index b76579cb43..1d81dce609 100644
--- a/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@ -396,6 +396,7 @@ void ide_set_reset (int idereset)
  */
 int post_hotkeys_pressed(void)
 {
+#ifdef CONFIG_STK52XX
 	struct mpc5xxx_gpio *gpio;
 
 	gpio = (struct mpc5xxx_gpio*) MPC5XXX_GPIO;
@@ -414,6 +415,9 @@ int post_hotkeys_pressed(void)
 	gpio->simple_ddr &= ~(0x20000000);
 
 	return ((gpio->simple_ival & 0x20000000) ? 0 : 1);
+#else
+	return 0;
+#endif
 }
 #endif