projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
[platform/kernel/u-boot.git]
/
board
/
esd
/
cpciiser4
/
cpciiser4.c
diff --git
a/board/esd/cpciiser4/cpciiser4.c
b/board/esd/cpciiser4/cpciiser4.c
index
725abe9
..
fcb8cbb
100644
(file)
--- a/
board/esd/cpciiser4/cpciiser4.c
+++ b/
board/esd/cpciiser4/cpciiser4.c
@@
-26,9
+26,12
@@
#include <asm/processor.h>
#include <command.h>
#include <asm/processor.h>
#include <command.h>
+DECLARE_GLOBAL_DATA_PTR;
+
/*cmd_boot.c*/
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
/*cmd_boot.c*/
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern void lxt971_no_sleep(void);
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
@@
-52,10
+55,8
@@
const unsigned char fpgadata[] = {
#include "../common/fpga.c"
#include "../common/fpga.c"
-int board_
pre_init
(void)
+int board_
early_init_f
(void)
{
{
- DECLARE_GLOBAL_DATA_PTR;
-
int index, len, i;
volatile unsigned char dummy;
int status;
int index, len, i;
volatile unsigned char dummy;
int status;
@@
-152,18
+153,17
@@
int checkboard (void)
{
int index;
int len;
{
int index;
int len;
-
unsigned
char str[64];
+ char str[64];
int i = getenv_r ("serial#", str, sizeof (str));
puts ("Board: ");
int i = getenv_r ("serial#", str, sizeof (str));
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 */
puts ("\nFPGA: ");
/* display infos on fpgaimage */
@@
-176,6
+176,11
@@
int checkboard (void)
putc ('\n');
putc ('\n');
+ /*
+ * Disable sleep mode in LXT971
+ */
+ lxt971_no_sleep();
+
return 0;
}
return 0;
}