Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

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

diff --git a/board/esd/ocrtc/ocrtc.c b/board/esd/ocrtc/ocrtc.c
index dc425ae2be8d9672dbf356d084b7a94c2ff40457..35bfa95f269adb9c5fbebc7e3e1370cd17584037 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)
 {
@@ -60,22 +62,12 @@ int board_early_init_f (void)
        return 0;
 }
 
-
-/* ------------------------------------------------------------------------- */
-
-int misc_init_f (void)
-{
-       return 0;                                       /* dummy implementation */
-}
-
-
 /*
  * Check Board Identity:
  */
-
 int checkboard (void)
 {
-       unsigned char str[64];
+       char str[64];
        int i = getenv_r ("serial#", str, sizeof (str));
 
        puts ("Board: ");
@@ -93,34 +85,10 @@ int checkboard (void)
 
        putc ('\n');
 
-       return (0);
-}
-
-/* ------------------------------------------------------------------------- */
-
-long int initdram (int board_type)
-{
-       unsigned long val;
-
-       mtdcr (memcfga, mem_mb0cf);
-       val = mfdcr (memcfgd);
-
-#if 0
-       printf ("\nmb0cf=%x\n", val);   /* test-only */
-       printf ("strap=%x\n", mfdcr (strap));   /* test-only */
-#endif
-
-       return (4 * 1024 * 1024 << ((val & 0x000e0000) >> 17));
-}
-
-/* ------------------------------------------------------------------------- */
-
-int testdram (void)
-{
-       /* TODO: XXX XXX XXX */
-       printf ("test: 16 MB - ok\n");
+       /*
+        * Disable sleep mode in LXT971
+        */
+       lxt971_no_sleep();
 
        return (0);
 }
-
-/* ------------------------------------------------------------------------- */