Merge with /home/wd/git/u-boot/master

[u-boot] / board / dbau1x00 / dbau1x00.c

diff --git a/board/dbau1x00/dbau1x00.c b/board/dbau1x00/dbau1x00.c
index 8fcbd812a5c404c9124f827e3664e1986f00b64f..d29e8d591e31146b0fb5ea6cf56b042d5d6cac0f 100644 (file)
--- a/board/dbau1x00/dbau1x00.c
+++ b/board/dbau1x00/dbau1x00.c
@@ -30,7 +30,7 @@ long int initdram(int board_type)
 {
        /* Sdram is setup by assembler code */
        /* If memory could be changed, we should return the true value here */
-       return 64*1024*1024;
+       return MEM_SIZE*1024*1024;
 }
 
 #define BCSR_PCMCIA_PC0DRVEN           0x0010
@@ -39,18 +39,13 @@ long int initdram(int board_type)
 /* In cpu/mips/cpu.c */
 void write_one_tlb( int index, u32 pagemask, u32 hi, u32 low0, u32 low1 );
 
-#ifdef CONFIG_DBAU1100
-#warning "FIXME Check that bcsr is the same as dbau1000 board!"
-#endif
-#ifdef CONFIG_DBAU1500
-#warning "FIXME Check that bcsr is the same as dbau1000 board!"
-#endif
-
 int checkboard (void)
 {
+#ifdef CONFIG_IDE_PCMCIA
        u16 status;
-       volatile u32 *pcmcia_bcsr = (u32*)(DB1000_BCSR_ADDR+0x10);
-       volatile u32 *phy = (u32*)(DB1000_BCSR_ADDR+0xC);
+       volatile u32 *pcmcia_bcsr = (u32*)(DB1XX0_BCSR_ADDR+0x10);
+#endif /* CONFIG_IDE_PCMCIA */
+       volatile u32 *phy = (u32*)(DB1XX0_BCSR_ADDR+0xC);
        volatile u32 *sys_counter = (volatile u32*)SYS_COUNTER_CNTRL;
        u32 proc_id;
 
@@ -74,6 +69,11 @@ int checkboard (void)
                printf ("CPU: Au1100, id: 0x%02x, rev: 0x%02x\n",
                        (proc_id >> 8) & 0xFF, proc_id & 0xFF);
                break;
+       case 3:
+               puts ("Board: DbAu1550\n");
+               printf ("CPU: Au1550, id: 0x%02x, rev: 0x%02x\n",
+                       (proc_id >> 8) & 0xFF, proc_id & 0xFF);
+               break;
        default:
                printf ("Unsupported cpu %d, proc_id=0x%x\n", proc_id >> 24, proc_id);
        }
@@ -111,17 +111,17 @@ int checkboard (void)
                      CFG_PCMCIA_ATTR_BASE, /* Hi */
                      0x3D000017,           /* Lo0 */
                      0x3D200017);          /* Lo1 */
-#endif
+#endif /* 0 */
        write_one_tlb(22,                   /* index */
                      0x01ffe000,           /* Pagemask, 16 MB pages */
                      CFG_PCMCIA_MEM_ADDR,  /* Hi */
                      0x3E000017,           /* Lo0 */
                      0x3E200017);          /* Lo1 */
+#endif /* CONFIG_IDE_PCMCIA */
 
        /* Release reset of ethernet PHY chips */
        /* Always do this, because linux does not know about it */
        *phy = 3;
 
        return 0;
-#endif
 }