Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[u-boot] / common / xilinx.c

diff --git a/common/xilinx.c b/common/xilinx.c
index 40ce3bcbbf008ea2a3a4efeda94cce76271b4900..7b5e8c5bbd3a48c0dc0048fa75396f44cccac6b9 100644 (file)
--- a/common/xilinx.c
+++ b/common/xilinx.c
@@ -32,8 +32,6 @@
 #include <spartan2.h>
 #include <spartan3.h>
 
-#if (CONFIG_FPGA & CFG_FPGA_XILINX)
-
 #if 0
 #define FPGA_DEBUG
 #endif
@@ -54,12 +52,12 @@ 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) {
                case Xilinx_Spartan2:
-#if (CONFIG_FPGA & CFG_SPARTAN2)
+#if defined(CONFIG_FPGA_SPARTAN2)
                        PRINTF ("%s: Launching the Spartan-II Loader...\n",
                                        __FUNCTION__);
                        ret_val = Spartan2_load (desc, buf, bsize);
@@ -69,7 +67,7 @@ int xilinx_load (Xilinx_desc * desc, void *buf, size_t bsize)
 #endif
                        break;
                case Xilinx_Spartan3:
-#if (CONFIG_FPGA & CFG_SPARTAN3)
+#if defined(CONFIG_FPGA_SPARTAN3)
                        PRINTF ("%s: Launching the Spartan-III Loader...\n",
                                        __FUNCTION__);
                        ret_val = Spartan3_load (desc, buf, bsize);
@@ -79,7 +77,7 @@ int xilinx_load (Xilinx_desc * desc, void *buf, size_t bsize)
 #endif
                        break;
                case Xilinx_Virtex2:
-#if (CONFIG_FPGA & CFG_VIRTEX2)
+#if defined(CONFIG_FPGA_VIRTEX2)
                        PRINTF ("%s: Launching the Virtex-II Loader...\n",
                                        __FUNCTION__);
                        ret_val = Virtex2_load (desc, buf, bsize);
@@ -101,12 +99,12 @@ 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) {
                case Xilinx_Spartan2:
-#if (CONFIG_FPGA & CFG_SPARTAN2)
+#if defined(CONFIG_FPGA_SPARTAN2)
                        PRINTF ("%s: Launching the Spartan-II Reader...\n",
                                        __FUNCTION__);
                        ret_val = Spartan2_dump (desc, buf, bsize);
@@ -116,7 +114,7 @@ int xilinx_dump (Xilinx_desc * desc, void *buf, size_t bsize)
 #endif
                        break;
                case Xilinx_Spartan3:
-#if (CONFIG_FPGA & CFG_SPARTAN3)
+#if defined(CONFIG_FPGA_SPARTAN3)
                        PRINTF ("%s: Launching the Spartan-III Reader...\n",
                                        __FUNCTION__);
                        ret_val = Spartan3_dump (desc, buf, bsize);
@@ -126,7 +124,7 @@ int xilinx_dump (Xilinx_desc * desc, void *buf, size_t bsize)
 #endif
                        break;
                case Xilinx_Virtex2:
-#if (CONFIG_FPGA & CFG_VIRTEX2)
+#if defined( CONFIG_FPGA_VIRTEX2)
                        PRINTF ("%s: Launching the Virtex-II Reader...\n",
                                        __FUNCTION__);
                        ret_val = Virtex2_dump (desc, buf, bsize);
@@ -148,7 +146,7 @@ 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:
@@ -198,7 +196,7 @@ int xilinx_info (Xilinx_desc * desc)
                        printf ("Device Function Table @ 0x%p\n", desc->iface_fns);
                        switch (desc->family) {
                        case Xilinx_Spartan2:
-#if (CONFIG_FPGA & CFG_SPARTAN2)
+#if defined(CONFIG_FPGA_SPARTAN2)
                                Spartan2_info (desc);
 #else
                                /* just in case */
@@ -207,7 +205,7 @@ int xilinx_info (Xilinx_desc * desc)
 #endif
                                break;
                        case Xilinx_Spartan3:
-#if (CONFIG_FPGA & CFG_SPARTAN3)
+#if defined(CONFIG_FPGA_SPARTAN3)
                                Spartan3_info (desc);
 #else
                                /* just in case */
@@ -216,7 +214,7 @@ int xilinx_info (Xilinx_desc * desc)
 #endif
                                break;
                        case Xilinx_Virtex2:
-#if (CONFIG_FPGA & CFG_VIRTEX2)
+#if defined(CONFIG_FPGA_VIRTEX2)
                                Virtex2_info (desc);
 #else
                                /* just in case */
@@ -244,12 +242,12 @@ 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) {
                case Xilinx_Spartan2:
-#if (CONFIG_FPGA & CFG_SPARTAN2)
+#if defined(CONFIG_FPGA_SPARTAN2)
                        ret_val = Spartan2_reloc (desc, reloc_offset);
 #else
                        printf ("%s: No support for Spartan-II devices.\n",
@@ -257,7 +255,7 @@ int xilinx_reloc (Xilinx_desc * desc, ulong reloc_offset)
 #endif
                        break;
                case Xilinx_Spartan3:
-#if (CONFIG_FPGA & CFG_SPARTAN3)
+#if defined(CONFIG_FPGA_SPARTAN3)
                        ret_val = Spartan3_reloc (desc, reloc_offset);
 #else
                        printf ("%s: No support for Spartan-III devices.\n",
@@ -265,7 +263,7 @@ int xilinx_reloc (Xilinx_desc * desc, ulong reloc_offset)
 #endif
                        break;
                case Xilinx_Virtex2:
-#if (CONFIG_FPGA & CFG_VIRTEX2)
+#if defined(CONFIG_FPGA_VIRTEX2)
                        ret_val = Virtex2_reloc (desc, reloc_offset);
 #else
                        printf ("%s: No support for Virtex-II devices.\n",
@@ -307,5 +305,3 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn)
 
        return ret_val;
 }
-
-#endif                                                 /* CONFIG_FPGA & CFG_FPGA_XILINX */