Merge branch 'master' of http://www.denx.de/git/u-boot

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

diff --git a/board/esd/cpci440/cpci440.c b/board/esd/cpci440/cpci440.c
index 66cfe0648fe75a0a6689edfca6e89123395669ec..43d8a3b3bf06e2d2aa9c135042b1819ea96e725a 100644 (file)
--- a/board/esd/cpci440/cpci440.c
+++ b/board/esd/cpci440/cpci440.c
@@ -26,9 +26,12 @@
 #include <asm/processor.h>
 
 
+extern void lxt971_no_sleep(void);
+
+
 long int fixed_sdram( void );
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
        uint reg;
 
@@ -77,6 +80,12 @@ int checkboard (void)
        printf("\tPLB: %lu MHz\n", sysinfo.freqPLB/1000000);
        printf("\tOPB: %lu MHz\n", sysinfo.freqOPB/1000000);
        printf("\tEPB: %lu MHz\n", sysinfo.freqEPB/1000000);
+
+       /*
+        * Disable sleep mode in LXT971
+        */
+       lxt971_no_sleep();
+
        return (0);
 }
 
@@ -101,6 +110,7 @@ long int fixed_sdram( void )
 {
        uint    reg;
 
+#if 1 /* test-only */
        /*--------------------------------------------------------------------
         * Setup some default
         *------------------------------------------------------------------*/
@@ -136,4 +146,7 @@ long int fixed_sdram( void )
        }
 
        return( 64 * 1024 * 1024 );      /* 64 MB                           */
+#else
+       return( 32 * 1024 * 1024 );      /* 64 MB                           */
+#endif
 }