CPCI440 board update

diff --git a/board/esd/cpci440/Makefile b/board/esd/cpci440/Makefile
index f706ebcd68913451eb55b390dbbc9b791c60f4f4..84d44fbf4fa972117d8dbc58392e9e50125ede63 100644 (file)
--- a/board/esd/cpci440/Makefile
+++ b/board/esd/cpci440/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    = lib$(BOARD).a
 
-OBJS   = $(BOARD).o strataflash.o
+OBJS   = $(BOARD).o strataflash.o ../common/misc.o
 SOBJS  = init.o
 
 $(LIB):        $(OBJS) $(SOBJS)

diff --git a/board/esd/cpci440/config.mk b/board/esd/cpci440/config.mk
index e5722dd36a76e47ed9c2f94f878e03ff05c48993..8e5f63fe489e16e923c5755e764bc84f613f0f86 100644 (file)
--- a/board/esd/cpci440/config.mk
+++ b/board/esd/cpci440/config.mk
@@ -31,6 +31,7 @@ ifeq ($(ramsym),1)
 TEXT_BASE = 0x07FD0000
 else
 TEXT_BASE = 0xFFFC0000
+#TEXT_BASE = 0x01fc0000
 endif
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1

diff --git a/board/esd/cpci440/cpci440.c b/board/esd/cpci440/cpci440.c
index 20c830343bd2f11bd8ff7650821f7b2c0d687c0e..43d8a3b3bf06e2d2aa9c135042b1819ea96e725a 100644 (file)
--- a/board/esd/cpci440/cpci440.c
+++ b/board/esd/cpci440/cpci440.c
@@ -26,6 +26,9 @@
 #include <asm/processor.h>
 
 
+extern void lxt971_no_sleep(void);
+
+
 long int fixed_sdram( void );
 
 int board_early_init_f (void)
@@ -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
 }

diff --git a/board/esd/cpci440/u-boot.lds b/board/esd/cpci440/u-boot.lds
index 46ccf31d47f61f6f37c1d6a4543b26028b29e753..3925ad9eb67f9719270ed0cd3659cbfe006c17be 100644 (file)
--- a/board/esd/cpci440/u-boot.lds
+++ b/board/esd/cpci440/u-boot.lds
@@ -28,11 +28,13 @@ SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/
 SECTIONS
 {
   .resetvec 0xFFFFFFFC :
+/*  .resetvec 0x01FFFFFC :*/
   {
     *(.resetvec)
   } = 0xffff
 
   .bootpg 0xFFFFF000 :
+/*  .bootpg 0x01FFF000 :*/
   {
     cpu/ppc4xx/start.o (.bootpg)
   } = 0xffff