Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git] / board / esd / ar405 / ar405.c
index d0b06e648799464b9a510b525f5b06511057cc78..c4b4b676703829f2822ba943e9564220de1f4b08 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2001
+ * (C) Copyright 2001-2004
  * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
  *
  * See file CREDITS for list of people who contributed to this
 #include <asm/processor.h>
 #include <command.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /*cmd_boot.c*/
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern void lxt971_no_sleep(void);
 
 /* ------------------------------------------------------------------------- */
 
@@ -40,16 +43,18 @@ const unsigned char fpgadata[] = {
 #include "fpgadata.c"
 };
 
+const unsigned char fpgadata_xl30[] = {
+#include "fpgadata_xl30.c"
+};
+
 /*
  * include common fpga code (for esd boards)
  */
 #include "../common/fpga.c"
 
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        int index, len, i;
        int status;
 
@@ -64,45 +69,52 @@ int board_pre_init (void)
        /*
         * Boot onboard FPGA
         */
+       /* first try 40er image */
+       gd->board_type = 40;
        status = fpga_boot ((unsigned char *) fpgadata, sizeof (fpgadata));
        if (status != 0) {
-               /* booting FPGA failed */
+               /* try xl30er image */
+               gd->board_type = 30;
+               status = fpga_boot ((unsigned char *) fpgadata_xl30, sizeof (fpgadata_xl30));
+               if (status != 0) {
+                       /* booting FPGA failed */
 #ifndef FPGA_DEBUG
-               /* set up serial port with default baudrate */
-               (void) get_clocks ();
-               gd->baudrate = CONFIG_BAUDRATE;
-               serial_init ();
-               console_init_f ();
+                       /* set up serial port with default baudrate */
+                       (void) get_clocks ();
+                       gd->baudrate = CONFIG_BAUDRATE;
+                       serial_init ();
+                       console_init_f ();
 #endif
-               printf ("\nFPGA: Booting failed ");
-               switch (status) {
-               case ERROR_FPGA_PRG_INIT_LOW:
-                       printf ("(Timeout: INIT not low after asserting PROGRAM*)\n ");
-                       break;
-               case ERROR_FPGA_PRG_INIT_HIGH:
-                       printf ("(Timeout: INIT not high after deasserting PROGRAM*)\n ");
-                       break;
-               case ERROR_FPGA_PRG_DONE:
-                       printf ("(Timeout: DONE not high after programming FPGA)\n ");
-                       break;
-               }
-
-               /* display infos on fpgaimage */
-               index = 15;
-               for (i = 0; i < 4; i++) {
-                       len = fpgadata[index];
-                       printf ("FPGA: %s\n", &(fpgadata[index + 1]));
-                       index += len + 3;
-               }
-               putc ('\n');
-               /* delayed reboot */
-               for (i = 20; i > 0; i--) {
-                       printf ("Rebooting in %2d seconds \r", i);
-                       for (index = 0; index < 1000; index++)
-                               udelay (1000);
+                       printf ("\nFPGA: Booting failed ");
+                       switch (status) {
+                       case ERROR_FPGA_PRG_INIT_LOW:
+                               printf ("(Timeout: INIT not low after asserting PROGRAM*)\n ");
+                               break;
+                       case ERROR_FPGA_PRG_INIT_HIGH:
+                               printf ("(Timeout: INIT not high after deasserting PROGRAM*)\n ");
+                               break;
+                       case ERROR_FPGA_PRG_DONE:
+                               printf ("(Timeout: DONE not high after programming FPGA)\n ");
+                               break;
+                       }
+
+                       /* display infos on fpgaimage */
+                       index = 15;
+                       for (i = 0; i < 4; i++) {
+                               len = fpgadata[index];
+                               printf ("FPGA: %s\n", &(fpgadata[index + 1]));
+                               index += len + 3;
+                       }
+                       putc ('\n');
+                       /* delayed reboot */
+                       for (i = 20; i > 0; i--) {
+                               printf ("Rebooting in %2d seconds \r", i);
+                               for (index = 0; index < 1000; index++)
+                                       udelay (1000);
+                       }
+                       putc ('\n');
+                       do_reset (NULL, 0, 0, NULL);
                }
-               putc ('\n');
-               do_reset (NULL, 0, 0, NULL);
        }
 
        /*
@@ -141,48 +153,262 @@ int checkboard (void)
 {
        int index;
        int len;
-       unsigned char str[64];
+       char str[64];
        int i = getenv_r ("serial#", str, sizeof (str));
+       const unsigned char *fpga;
 
        puts ("Board: ");
 
-       if (!i || strncmp (str, "AR405", 5)) {
-               puts ("### No HW ID - assuming AR405\n");
-               return (0);
+       if (i == -1) {
+               puts ("### No HW ID - assuming AR405");
+       } else {
+               puts(str);
        }
 
-       puts (str);
-
        puts ("\nFPGA:  ");
 
        /* display infos on fpgaimage */
+       if (gd->board_type == 30) {
+               fpga = fpgadata_xl30;
+       } else {
+               fpga = fpgadata;
+       }
        index = 15;
        for (i = 0; i < 4; i++) {
-               len = fpgadata[index];
-               printf ("%s ", &(fpgadata[index + 1]));
+               len = fpga[index];
+               printf ("%s ", &(fpga[index + 1]));
                index += len + 3;
        }
 
        putc ('\n');
 
+       /*
+        * Disable sleep mode in LXT971
+        */
+       lxt971_no_sleep();
+
        return 0;
 }
 
-/* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+#if 1 /* test-only: some internal test routines... */
+/*
+ * Some test routines
+ */
+int do_digtest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       return (16 * 1024 * 1024);
+       volatile uchar *digen = (volatile uchar *)0xf03000b4;
+       volatile ushort *digout = (volatile ushort *)0xf03000b0;
+       volatile ushort *digin = (volatile ushort *)0xf03000a0;
+       int i;
+       int k;
+       int start;
+       int end;
+
+       if (argc != 3) {
+               puts("Usage: digtest n_start n_end (digtest 0 7)\n");
+               return 0;
+       }
+
+       start = simple_strtol (argv[1], NULL, 10);
+       end = simple_strtol (argv[2], NULL, 10);
+
+       /*
+        * Enable digital outputs
+        */
+       *digen = 0x08;
+
+       printf("\nStarting digital In-/Out Test from I/O %d to %d (Cntrl-C to abort)...\n",
+              start, end);
+
+       /*
+        * Set outputs one by one
+        */
+       for (;;) {
+               for (i=start; i<=end; i++) {
+                       *digout = 0x0001 << i;
+                       for (k=0; k<200; k++)
+                               udelay(1000);
+
+                       if (*digin != (0x0001 << i)) {
+                               printf("ERROR: OUT=0x%04X, IN=0x%04X\n", 0x0001 << i, *digin);
+                               return 0;
+                       }
+
+                       /* Abort if ctrl-c was pressed */
+                       if (ctrlc()) {
+                               puts("\nAbort\n");
+                               return 0;
+                       }
+               }
+       }
+
+       return 0;
 }
+U_BOOT_CMD(
+       digtest,        3,      1,      do_digtest,
+       "Test digital in-/output",
+       NULL
+       );
 
-/* ------------------------------------------------------------------------- */
 
-int testdram (void)
+#define ERROR_DELTA     256
+
+struct io {
+       volatile short val;
+       short dummy;
+};
+
+int do_anatest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       /* TODO: XXX XXX XXX */
-       printf ("test: 16 MB - ok\n");
+       volatile short val;
+       int i;
+       int volt;
+       struct io *out;
+       struct io *in;
+
+       out = (struct io *)0xf0300090;
+       in = (struct io *)0xf0300000;
+
+       i = simple_strtol (argv[1], NULL, 10);
+
+       volt = 0;
+       printf("Setting Channel %d to %dV...\n", i, volt);
+       out[i].val = (volt * 0x7fff) / 10;
+       udelay(10000);
+       val = in[i*2].val;
+       printf("-> InChannel %d: 0x%04x=%dV\n", i*2, val, (val * 4000) / 0x7fff);
+       if ((val < ((volt * 0x7fff) / 40) - ERROR_DELTA) ||
+           (val > ((volt * 0x7fff) / 40) + ERROR_DELTA)) {
+               printf("ERROR! (min=0x%04x max=0x%04x)\n", ((volt * 0x7fff) / 40) - ERROR_DELTA,
+                      ((volt * 0x7fff) / 40) + ERROR_DELTA);
+               return -1;
+       }
+       val = in[i*2+1].val;
+       printf("-> InChannel %d: 0x%04x=%dV\n", i*2+1, val, (val * 4000) / 0x7fff);
+       if ((val < ((volt * 0x7fff) / 40) - ERROR_DELTA) ||
+           (val > ((volt * 0x7fff) / 40) + ERROR_DELTA)) {
+               printf("ERROR! (min=0x%04x max=0x%04x)\n", ((volt * 0x7fff) / 40) - ERROR_DELTA,
+                      ((volt * 0x7fff) / 40) + ERROR_DELTA);
+               return -1;
+       }
 
-       return (0);
+       volt = 5;
+       printf("Setting Channel %d to %dV...\n", i, volt);
+       out[i].val = (volt * 0x7fff) / 10;
+       udelay(10000);
+       val = in[i*2].val;
+       printf("-> InChannel %d: 0x%04x=%dV\n", i*2, val, (val * 4000) / 0x7fff);
+       if ((val < ((volt * 0x7fff) / 40) - ERROR_DELTA) ||
+           (val > ((volt * 0x7fff) / 40) + ERROR_DELTA)) {
+               printf("ERROR! (min=0x%04x max=0x%04x)\n", ((volt * 0x7fff) / 40) - ERROR_DELTA,
+                      ((volt * 0x7fff) / 40) + ERROR_DELTA);
+               return -1;
+       }
+       val = in[i*2+1].val;
+       printf("-> InChannel %d: 0x%04x=%dV\n", i*2+1, val, (val * 4000) / 0x7fff);
+       if ((val < ((volt * 0x7fff) / 40) - ERROR_DELTA) ||
+           (val > ((volt * 0x7fff) / 40) + ERROR_DELTA)) {
+               printf("ERROR! (min=0x%04x max=0x%04x)\n", ((volt * 0x7fff) / 40) - ERROR_DELTA,
+                      ((volt * 0x7fff) / 40) + ERROR_DELTA);
+               return -1;
+       }
+
+       volt = 10;
+       printf("Setting Channel %d to %dV...\n", i, volt);
+       out[i].val = (volt * 0x7fff) / 10;
+       udelay(10000);
+       val = in[i*2].val;
+       printf("-> InChannel %d: 0x%04x=%dV\n", i*2, val, (val * 4000) / 0x7fff);
+       if ((val < ((volt * 0x7fff) / 40) - ERROR_DELTA) ||
+           (val > ((volt * 0x7fff) / 40) + ERROR_DELTA)) {
+               printf("ERROR! (min=0x%04x max=0x%04x)\n", ((volt * 0x7fff) / 40) - ERROR_DELTA,
+                      ((volt * 0x7fff) / 40) + ERROR_DELTA);
+               return -1;
+       }
+       val = in[i*2+1].val;
+       printf("-> InChannel %d: 0x%04x=%dV\n", i*2+1, val, (val * 4000) / 0x7fff);
+       if ((val < ((volt * 0x7fff) / 40) - ERROR_DELTA) ||
+           (val > ((volt * 0x7fff) / 40) + ERROR_DELTA)) {
+               printf("ERROR! (min=0x%04x max=0x%04x)\n", ((volt * 0x7fff) / 40) - ERROR_DELTA,
+                      ((volt * 0x7fff) / 40) + ERROR_DELTA);
+               return -1;
+       }
+
+       printf("Channel %d OK!\n", i);
+
+       return 0;
 }
+U_BOOT_CMD(
+       anatest,        2,      1,      do_anatest,
+       "Test analog in-/output",
+       NULL
+       );
 
-/* ------------------------------------------------------------------------- */
+
+int counter = 0;
+
+void cyclicInt(void *ptr)
+{
+       *(ushort *)0xf03000e8 = 0x0800; /* ack int */
+       counter++;
+}
+
+
+int do_inctest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       volatile uchar *digout = (volatile uchar *)0xf03000b4;
+       volatile ulong *incin;
+       int i;
+
+       incin = (volatile ulong *)0xf0300040;
+
+       /*
+        * Clear inc counter
+        */
+       incin[0] = 0;
+       incin[1] = 0;
+       incin[2] = 0;
+       incin[3] = 0;
+
+       incin = (volatile ulong *)0xf0300050;
+
+       /*
+        * Inc a little
+        */
+       for (i=0; i<10000; i++) {
+               switch (i & 0x03) {
+               case 0:
+                       *digout = 0x02;
+                       break;
+               case 1:
+                       *digout = 0x03;
+                       break;
+               case 2:
+                       *digout = 0x01;
+                       break;
+               case 3:
+                       *digout = 0x00;
+                       break;
+               }
+               udelay(10);
+       }
+
+       printf("Inc 0 = %ld\n", incin[0]);
+       printf("Inc 1 = %ld\n", incin[1]);
+       printf("Inc 2 = %ld\n", incin[2]);
+       printf("Inc 3 = %ld\n", incin[3]);
+
+       *(ushort *)0xf03000e0 = 0x0c80-1; /* set counter */
+       *(ushort *)0xf03000ec |= 0x0800; /* enable int */
+       irq_install_handler (30, (interrupt_handler_t *) cyclicInt, NULL);
+       printf("counter=%d\n", counter);
+
+       return 0;
+}
+U_BOOT_CMD(
+       inctest,        3,      1,      do_inctest,
+       "Test incremental encoder inputs",
+       NULL
+       );
+#endif