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

[karo-tx-uboot.git] / board / esd / dp405 / dp405.c

diff --git a/board/esd/dp405/dp405.c b/board/esd/dp405/dp405.c
index eb001dacb6736b1cea23f406912ac6a0993a5204..587809226fbcd6873588b577920b0b7668e46daa 100644 (file)
--- a/board/esd/dp405/dp405.c
+++ b/board/esd/dp405/dp405.c
@@ -23,19 +23,12 @@
 
 #include <common.h>
 #include <asm/processor.h>
+#include <asm/io.h>
 #include <command.h>
 #include <malloc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* fpga configuration data - not compressed, generated by bin2c */
-const unsigned char fpgadata[] =
-{
-#include "fpgadata.c"
-};
-int filesize = sizeof(fpgadata);
-
-
 int board_early_init_f (void)
 {
        /*
@@ -50,25 +43,27 @@ int board_early_init_f (void)
         * IRQ 30 (EXT IRQ 5) PCI INTA; active low; level sensitive
         * IRQ 31 (EXT IRQ 6) COMPACT FLASH; active high; level sensitive
         */
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
-       mtdcr(uicer, 0x00000000);       /* disable all ints */
-       mtdcr(uiccr, 0x00000000);       /* set all to be non-critical*/
-       mtdcr(uicpr, 0xFFFFFF80);       /* set int polarities */
-       mtdcr(uictr, 0x10000000);       /* set int trigger levels */
-       mtdcr(uicvcr, 0x00000001);      /* set vect base=0,INT0 highest priority*/
-       mtdcr(uicsr, 0xFFFFFFFF);       /* clear all ints */
+       mtdcr(UIC0SR, 0xFFFFFFFF);       /* clear all ints */
+       mtdcr(UIC0ER, 0x00000000);       /* disable all ints */
+       mtdcr(UIC0CR, 0x00000000);       /* set all to be non-critical*/
+       mtdcr(UIC0PR, 0xFFFFFF80);       /* set int polarities */
+       mtdcr(UIC0TR, 0x10000000);       /* set int trigger levels */
+       mtdcr(UIC0VCR, 0x00000001);      /* set vect base=0,INT0 highest priority*/
+       mtdcr(UIC0SR, 0xFFFFFFFF);       /* clear all ints */
 
        /*
         * EBC Configuration Register: set ready timeout to 512 ebc-clks -> ca. 15 us
         */
-       mtebc (epcr, 0xa8400000); /* ebc always driven */
+       mtebc (EBC0_CFG, 0xa8400000); /* ebc always driven */
 
        /*
         * Reset CPLD via GPIO13 (CS4) pin
         */
-       out32(GPIO0_OR, in32(GPIO0_OR) & ~(0x80000000 >> 13));
+       out_be32((void *)GPIO0_OR,
+                in_be32((void *)GPIO0_OR) & ~(0x80000000 >> 13));
        udelay(1000); /* wait 1ms */
-       out32(GPIO0_OR, in32(GPIO0_OR) | (0x80000000 >> 13));
+       out_be32((void *)GPIO0_OR,
+                in_be32((void *)GPIO0_OR) | (0x80000000 >> 13));
        udelay(1000); /* wait 1ms */
 
        return 0;
@@ -91,22 +86,43 @@ int misc_init_r (void)
 int checkboard (void)
 {
        char str[64];
-       int i = getenv_r ("serial#", str, sizeof(str));
+       int i = getenv_f("serial#", str, sizeof(str));
        unsigned char trans[16] = {0x0,0x8,0x4,0xc,0x2,0xa,0x6,0xe,
                                   0x1,0x9,0x5,0xd,0x3,0xb,0x7,0xf};
-       unsigned char id1, id2;
+       unsigned char id1, id2, rev;
 
        puts ("Board: ");
 
-       if (i == -1) {
+       if (i == -1)
                puts ("### No HW ID - assuming DP405");
-       } else {
+       else
                puts(str);
+
+       id1 = trans[(~(in_be32((void *)GPIO0_IR) >> 5)) & 0x0000000f];
+       id2 = trans[(~(in_be32((void *)GPIO0_IR) >> 9)) & 0x0000000f];
+
+       rev = in_8((void *)0xf0001000);
+       if (rev & 0x10) /* old DP405 compatibility */
+               rev = in_8((void *)0xf0000800);
+
+       switch (rev & 0xc0) {
+       case 0x00:
+               puts(" (HW=DP405");
+               break;
+       case 0x80:
+               puts(" (HW=DP405/CO");
+               break;
+       case 0xc0:
+               puts(" (HW=DN405");
+               break;
        }
+       printf(", ID=0x%1X%1X, PLD=0x%02X", id2, id1, rev & 0x0f);
 
-       id1 = trans[(~(in32(GPIO0_IR) >> 5)) & 0x0000000f];
-       id2 = trans[(~(in32(GPIO0_IR) >> 9)) & 0x0000000f];
-       printf(" (ID=0x%1X%1X, PLD=0x%02X)\n", id2, id1, in8(0xf0001000));
+       if ((rev & 0xc0) == 0xc0) {
+               printf(", C5V=%s",
+                      in_be32((void *)GPIO0_IR) & 0x40000000 ? "off" : "on");
+       }
+       puts(")\n");
 
        return 0;
 }