Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[u-boot] / board / esd / ocrtc / ocrtc.c

diff --git a/board/esd/ocrtc/ocrtc.c b/board/esd/ocrtc/ocrtc.c
index dc425ae2be8d9672dbf356d084b7a94c2ff40457..7b0edd5958d682683d7d7a945470951163dfe042 100644 (file)
--- a/board/esd/ocrtc/ocrtc.c
+++ b/board/esd/ocrtc/ocrtc.c
@@ -27,7 +27,9 @@
 #include <i2c.h>
 #include <command.h>
 
-/* ------------------------------------------------------------------------- */
+
+extern void lxt971_no_sleep(void);
+
 
 int board_early_init_f (void)
 {
@@ -61,8 +63,6 @@ int board_early_init_f (void)
 }
 
 
-/* ------------------------------------------------------------------------- */
-
 int misc_init_f (void)
 {
        return 0;                                       /* dummy implementation */
@@ -72,10 +72,9 @@ int misc_init_f (void)
 /*
  * Check Board Identity:
  */
-
 int checkboard (void)
 {
-       unsigned char str[64];
+       char str[64];
        int i = getenv_r ("serial#", str, sizeof (str));
 
        puts ("Board: ");
@@ -93,12 +92,16 @@ int checkboard (void)
 
        putc ('\n');
 
+       /*
+        * Disable sleep mode in LXT971
+        */
+       lxt971_no_sleep();
+
        return (0);
 }
 
-/* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        unsigned long val;
 
@@ -113,7 +116,6 @@ long int initdram (int board_type)
        return (4 * 1024 * 1024 << ((val & 0x000e0000) >> 17));
 }
 
-/* ------------------------------------------------------------------------- */
 
 int testdram (void)
 {
@@ -122,5 +124,3 @@ int testdram (void)
 
        return (0);
 }
-
-/* ------------------------------------------------------------------------- */