]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
FPGA: fix support for non-Lattice devices
authorWolfgang Denk <wd@denx.de>
Mon, 18 Oct 2010 19:32:14 +0000 (21:32 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 18 Oct 2010 19:32:14 +0000 (21:32 +0200)
Commit 3b8ac464 "FPGA: add support for downloading Lattice bitstream"
added support for Lattice devices, but failed to add #ifdef's that are
needed when building for non-Lattice devices, which results in build
failures like these:

Configuring for GEN860T board...
drivers/fpga/libfpga.a(fpga.o): In function `fpga_dev_info':
/home/wd/git/u-boot/work/drivers/fpga/fpga.c:145: undefined reference to `lattice_info'
drivers/fpga/libfpga.a(fpga.o): In function `fpga_dump':
/home/wd/git/u-boot/work/drivers/fpga/fpga.c:269: undefined reference to `lattice_dump'
drivers/fpga/libfpga.a(fpga.o): In function `fpga_load':
/home/wd/git/u-boot/work/drivers/fpga/fpga.c:233: undefined reference to `lattice_load'
make: *** [u-boot] Error 1

Add the missing code.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
drivers/fpga/fpga.c

index e41e72851f2f3bd46ae0625f9fbe7f53ba18a795..a6690398ae1610fe4104ca3015999157b6b1b0ed 100644 (file)
@@ -141,8 +141,12 @@ static int fpga_dev_info( int devnum )
 #endif
                        break;
                case fpga_lattice:
+#if defined(CONFIG_FPGA_LATTICE)
                        printf("Lattice Device\nDescriptor @ 0x%p\n", desc);
                        ret_val = lattice_info(desc->devdesc);
+#else
+                       fpga_no_sup( (char *)__FUNCTION__, "Lattice devices" );
+#endif
                        break;
                default:
                        printf( "%s: Invalid or unsupported device type %d\n",
@@ -230,7 +234,11 @@ int fpga_load( int devnum, void *buf, size_t bsize )
 #endif
                        break;
                case fpga_lattice:
+#if defined(CONFIG_FPGA_LATTICE)
                        ret_val = lattice_load(desc->devdesc, buf, bsize);
+#else
+                       fpga_no_sup( (char *)__FUNCTION__, "Lattice devices" );
+#endif
                        break;
                default:
                        printf( "%s: Invalid or unsupported device type %d\n",
@@ -266,7 +274,11 @@ int fpga_dump( int devnum, void *buf, size_t bsize )
 #endif
                        break;
                case fpga_lattice:
+#if defined(CONFIG_FPGA_LATTICE)
                        ret_val = lattice_dump(desc->devdesc, buf, bsize);
+#else
+                       fpga_no_sup( (char *)__FUNCTION__, "Lattice devices" );
+#endif
                        break;
                default:
                        printf( "%s: Invalid or unsupported device type %d\n",