summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstroese <stroese>2004-12-16 18:35:14 +0000
committerstroese <stroese>2004-12-16 18:35:14 +0000
commit20aacbf0180fdbcb8b5660d0e8da8cdb49bd3a2c (patch)
tree2632c79f3458f92aacf274e0cf91f6b630be7cfc
parent7acd6c2168deb38129ab677371c503429a40c532 (diff)
downloadu-boot-imx-20aacbf0180fdbcb8b5660d0e8da8cdb49bd3a2c.zip
u-boot-imx-20aacbf0180fdbcb8b5660d0e8da8cdb49bd3a2c.tar.gz
u-boot-imx-20aacbf0180fdbcb8b5660d0e8da8cdb49bd3a2c.tar.bz2
CPCIISER4 board update
-rw-r--r--board/esd/cpciiser4/Makefile2
-rw-r--r--board/esd/cpciiser4/cpciiser4.c15
2 files changed, 11 insertions, 6 deletions
diff --git a/board/esd/cpciiser4/Makefile b/board/esd/cpciiser4/Makefile
index f5bda55..a60495a 100644
--- a/board/esd/cpciiser4/Makefile
+++ b/board/esd/cpciiser4/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = lib$(BOARD).a
-OBJS = $(BOARD).o flash.o
+OBJS = $(BOARD).o flash.o ../common/misc.o
$(LIB): $(OBJS) $(SOBJS)
$(AR) crv $@ $(OBJS)
diff --git a/board/esd/cpciiser4/cpciiser4.c b/board/esd/cpciiser4/cpciiser4.c
index e90f4ea..3d1f1fa 100644
--- a/board/esd/cpciiser4/cpciiser4.c
+++ b/board/esd/cpciiser4/cpciiser4.c
@@ -29,6 +29,7 @@
/*cmd_boot.c*/
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern void lxt971_no_sleep(void);
/* ------------------------------------------------------------------------- */
@@ -157,13 +158,12 @@ int checkboard (void)
puts ("Board: ");
- if (!i || strncmp (str, "CPCIISER4", 9)) {
- puts ("### No HW ID - assuming CPCIISER4\n");
- return (0);
+ if (i == -1) {
+ puts ("### No HW ID - assuming AR405");
+ } else {
+ puts(str);
}
- puts (str);
-
puts ("\nFPGA: ");
/* display infos on fpgaimage */
@@ -176,6 +176,11 @@ int checkboard (void)
putc ('\n');
+ /*
+ * Disable sleep mode in LXT971
+ */
+ lxt971_no_sleep();
+
return 0;
}