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 1d879c4ff777ca220efd96a484db0588d0796ce4..cc966ea975e05c667eb32ff969fa3da81db859f6 100644 (file)
--- 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 b76579cb43fc55b81ff33b40cf416ff965cfa908..1d81dce609093c9db43a0cec63179561e9233736 100644 (file)
--- 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