summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@atlas.denx.de>2006-10-09 01:07:53 +0200
committerWolfgang Denk <wd@atlas.denx.de>2006-10-09 01:07:53 +0200
commit1d92b2e550f5c069befe349a294238cee57959a9 (patch)
tree2eebde49e55960b889ed524372c439656dac0fd9
parent2b208f5308ae0c72a6840180e59ed1ab4f9b69fc (diff)
downloadu-boot-imx-1d92b2e550f5c069befe349a294238cee57959a9.zip
u-boot-imx-1d92b2e550f5c069befe349a294238cee57959a9.tar.gz
u-boot-imx-1d92b2e550f5c069befe349a294238cee57959a9.tar.bz2
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
-rw-r--r--CHANGELOG4
-rw-r--r--board/tqm5200/tqm5200.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1d879c4..cc966ea 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 b76579c..1d81dce 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