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

[oweals/u-boot.git] / board / esd / pmc405 / pmc405.c

diff --git a/board/esd/pmc405/pmc405.c b/board/esd/pmc405/pmc405.c
index 5410a56c53cfdfa737012036d792c8f48a130587..c0781dc950ef7b1815764d03660516778ece4f00 100644 (file)
--- a/board/esd/pmc405/pmc405.c
+++ b/board/esd/pmc405/pmc405.c
@@ -1,6 +1,9 @@
 /*
  * (C) Copyright 2001-2003
- * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
+ * Stefan Roese, DENX Software Engineering, sr@denx.de.
+ *
+ * (C) Copyright 2005
+ * Matthias Fuchs, esd gmbh germany, matthias.fuchs@esd-electronics.com
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -26,6 +29,9 @@
 #include <command.h>
 #include <malloc.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
+extern void lxt971_no_sleep(void);
 
 /* fpga configuration data - not compressed, generated by bin2c */
 const unsigned char fpgadata[] =
@@ -35,7 +41,7 @@ const unsigned char fpgadata[] =
 int filesize = sizeof(fpgadata);
 
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
        /*
         * IRQ 0-15  405GP internally generated; active high; level sensitive
@@ -62,31 +68,67 @@ int board_pre_init (void)
         */
        mtebc (epcr, 0xa8400000);
 
+       /*
+        * Setup GPIO pins
+        */
+
+       mtdcr(cntrl0, mfdcr(cntrl0) | ((CONFIG_SYS_FPGA_INIT | \
+                                       CONFIG_SYS_FPGA_DONE | \
+                                       CONFIG_SYS_XEREADY | \
+                                       CONFIG_SYS_NONMONARCH | \
+                                       CONFIG_SYS_REV1_2) << 5));
+
+       if (!(in32(GPIO0_IR) & CONFIG_SYS_REV1_2)) {
+               /* rev 1.2 boards */
+               mtdcr(cntrl0, mfdcr(cntrl0) | ((CONFIG_SYS_INTA_FAKE | \
+                                               CONFIG_SYS_SELF_RST) << 5));
+       }
+
+       out32(GPIO0_OR, 0);
+       out32(GPIO0_TCR, CONFIG_SYS_FPGA_PRG | CONFIG_SYS_FPGA_CLK | CONFIG_SYS_FPGA_DATA | CONFIG_SYS_XEREADY); /* setup for output */
+
+       /* - check if rev1_2 is low, then:
+        * - set/reset CONFIG_SYS_INTA_FAKE/CONFIG_SYS_SELF_RST in TCR to assert INTA# or SELFRST#
+        */
+
        return 0;
 }
 
 
 /* ------------------------------------------------------------------------- */
 
-int misc_init_f (void)
-{
-       return 0;  /* dummy implementation */
-}
-
 
 int misc_init_r (void)
 {
+       /* adjust flash start and offset */
+       gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
+       gd->bd->bi_flashoffset = 0;
+
+       out32(GPIO0_OR, in32(GPIO0_OR) | CONFIG_SYS_XEREADY); /* deassert EREADY# */
        return (0);
 }
 
+ushort pmc405_pci_subsys_deviceid(void)
+{
+       ulong val;
+       val = in32(GPIO0_IR);
+       if (!(val & CONFIG_SYS_REV1_2)) { /* low=rev1.2 */
+               if (val & CONFIG_SYS_NONMONARCH) { /* monarch# signal */
+                       return CONFIG_SYS_PCI_SUBSYS_DEVICEID_NONMONARCH;
+               }
+               return CONFIG_SYS_PCI_SUBSYS_DEVICEID_MONARCH;
+       }
+       return CONFIG_SYS_PCI_SUBSYS_DEVICEID_NONMONARCH;
+}
 
 /*
  * Check Board Identity:
  */
-
 int checkboard (void)
 {
-       unsigned char str[64];
+       ulong val;
+
+       char str[64];
        int i = getenv_r ("serial#", str, sizeof(str));
 
        puts ("Board: ");
@@ -97,36 +139,70 @@ int checkboard (void)
                puts(str);
        }
 
+       val = in32(GPIO0_IR);
+       if (!(val & CONFIG_SYS_REV1_2)) { /* low=rev1.2 */
+               puts(" rev1.2 (");
+               if (val & CONFIG_SYS_NONMONARCH) { /* monarch# signal */
+                       puts("non-");
+               }
+               puts("monarch)");
+       } else {
+               puts(" <=rev1.1");
+       }
+
        putc ('\n');
 
        return 0;
 }
 
 /* ------------------------------------------------------------------------- */
-
-long int initdram (int board_type)
+void reset_phy(void)
 {
-       unsigned long val;
+#ifdef CONFIG_LXT971_NO_SLEEP
 
-       mtdcr(memcfga, mem_mb0cf);
-       val = mfdcr(memcfgd);
-
-#if 0
-       printf("\nmb0cf=%x\n", val); /* test-only */
-       printf("strap=%x\n", mfdcr(strap)); /* test-only */
+       /*
+        * Disable sleep mode in LXT971
+        */
+       lxt971_no_sleep();
 #endif
-
-       return (4*1024*1024 << ((val & 0x000e0000) >> 17));
 }
 
-/* ------------------------------------------------------------------------- */
 
-int testdram (void)
+int do_cantest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       /* TODO: XXX XXX XXX */
-       printf ("test: 16 MB - ok\n");
+       ulong addr;
+       volatile uchar *ptr;
+       volatile uchar val;
+       int i;
+
+       addr = simple_strtol (argv[1], NULL, 16) + 0x16;
+
+       i = 0;
+       for (;;) {
+               ptr = (uchar *)addr;
+               for (i=0; i<8; i++) {
+                       *ptr = i;
+                       val = *ptr;
+
+                       if (val != i) {
+                               printf("ERROR: addr=%p write=0x%02X, read=0x%02X\n", ptr, i, val);
+                               return 0;
+                       }
+
+                       /* Abort if ctrl-c was pressed */
+                       if (ctrlc()) {
+                               puts("\nAbort\n");
+                               return 0;
+                       }
+
+                       ptr++;
+               }
+       }
 
-       return (0);
+       return 0;
 }
-
-/* ------------------------------------------------------------------------- */
+U_BOOT_CMD(
+       cantest,        3,      1,      do_cantest,
+       "cantest - Test CAN controller",
+       NULL
+       );