Merge with /home/wd/git/u-boot/custodian/u-boot-blackfin

[platform/kernel/u-boot.git] / common / xilinx.c

diff --git a/common/xilinx.c b/common/xilinx.c
index b2e6169..e03e78c 100644 (file)
--- a/common/xilinx.c
+++ b/common/xilinx.c
@@ -30,6 +30,7 @@
 #include <common.h>
 #include <virtex2.h>
 #include <spartan2.h>
+#include <spartan3.h>
 
 #if (CONFIG_FPGA & CFG_FPGA_XILINX)
 
@@ -53,7 +54,7 @@ int xilinx_load (Xilinx_desc * desc, void *buf, size_t bsize)
 {
        int ret_val = FPGA_FAIL;        /* assume a failure */
 
-       if (!xilinx_validate (desc, __FUNCTION__)) {
+       if (!xilinx_validate (desc, (char *)__FUNCTION__)) {
                printf ("%s: Invalid device descriptor\n", __FUNCTION__);
        } else
                switch (desc->family) {
@@ -67,6 +68,16 @@ int xilinx_load (Xilinx_desc * desc, void *buf, size_t bsize)
                                        __FUNCTION__);
 #endif
                        break;
+               case Xilinx_Spartan3:
+#if (CONFIG_FPGA & CFG_SPARTAN3)
+                       PRINTF ("%s: Launching the Spartan-III Loader...\n",
+                                       __FUNCTION__);
+                       ret_val = Spartan3_load (desc, buf, bsize);
+#else
+                       printf ("%s: No support for Spartan-III devices.\n",
+                                       __FUNCTION__);
+#endif
+                       break;
                case Xilinx_Virtex2:
 #if (CONFIG_FPGA & CFG_VIRTEX2)
                        PRINTF ("%s: Launching the Virtex-II Loader...\n",
@@ -90,7 +101,7 @@ int xilinx_dump (Xilinx_desc * desc, void *buf, size_t bsize)
 {
        int ret_val = FPGA_FAIL;        /* assume a failure */
 
-       if (!xilinx_validate (desc, __FUNCTION__)) {
+       if (!xilinx_validate (desc, (char *)__FUNCTION__)) {
                printf ("%s: Invalid device descriptor\n", __FUNCTION__);
        } else
                switch (desc->family) {
@@ -104,6 +115,16 @@ int xilinx_dump (Xilinx_desc * desc, void *buf, size_t bsize)
                                        __FUNCTION__);
 #endif
                        break;
+               case Xilinx_Spartan3:
+#if (CONFIG_FPGA & CFG_SPARTAN3)
+                       PRINTF ("%s: Launching the Spartan-III Reader...\n",
+                                       __FUNCTION__);
+                       ret_val = Spartan3_dump (desc, buf, bsize);
+#else
+                       printf ("%s: No support for Spartan-III devices.\n",
+                                       __FUNCTION__);
+#endif
+                       break;
                case Xilinx_Virtex2:
 #if (CONFIG_FPGA & CFG_VIRTEX2)
                        PRINTF ("%s: Launching the Virtex-II Reader...\n",
@@ -127,12 +148,15 @@ int xilinx_info (Xilinx_desc * desc)
 {
        int ret_val = FPGA_FAIL;
 
-       if (xilinx_validate (desc, __FUNCTION__)) {
+       if (xilinx_validate (desc, (char *)__FUNCTION__)) {
                printf ("Family:        \t");
                switch (desc->family) {
                case Xilinx_Spartan2:
                        printf ("Spartan-II\n");
                        break;
+               case Xilinx_Spartan3:
+                       printf ("Spartan-III\n");
+                       break;
                case Xilinx_Virtex2:
                        printf ("Virtex-II\n");
                        break;
@@ -182,6 +206,15 @@ int xilinx_info (Xilinx_desc * desc)
                                                __FUNCTION__);
 #endif
                                break;
+                       case Xilinx_Spartan3:
+#if (CONFIG_FPGA & CFG_SPARTAN3)
+                               Spartan3_info (desc);
+#else
+                               /* just in case */
+                               printf ("%s: No support for Spartan-III devices.\n",
+                                               __FUNCTION__);
+#endif
+                               break;
                        case Xilinx_Virtex2:
 #if (CONFIG_FPGA & CFG_VIRTEX2)
                                Virtex2_info (desc);
@@ -211,7 +244,7 @@ int xilinx_reloc (Xilinx_desc * desc, ulong reloc_offset)
 {
        int ret_val = FPGA_FAIL;        /* assume a failure */
 
-       if (!xilinx_validate (desc, __FUNCTION__)) {
+       if (!xilinx_validate (desc, (char *)__FUNCTION__)) {
                printf ("%s: Invalid device descriptor\n", __FUNCTION__);
        } else
                switch (desc->family) {
@@ -223,6 +256,14 @@ int xilinx_reloc (Xilinx_desc * desc, ulong reloc_offset)
                                        __FUNCTION__);
 #endif
                        break;
+               case Xilinx_Spartan3:
+#if (CONFIG_FPGA & CFG_SPARTAN3)
+                       ret_val = Spartan3_reloc (desc, reloc_offset);
+#else
+                       printf ("%s: No support for Spartan-III devices.\n",
+                                       __FUNCTION__);
+#endif
+                       break;
                case Xilinx_Virtex2:
 #if (CONFIG_FPGA & CFG_VIRTEX2)
                        ret_val = Virtex2_reloc (desc, reloc_offset);