Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / fpga.h

diff --git a/include/fpga.h b/include/fpga.h
index 52d93b10096517361f50bcd3117671ba1e7957ca..30a4e6a2e8540558d87ed60d22183763a34b2795 100644 (file)
--- a/include/fpga.h
+++ b/include/fpga.h
@@ -31,22 +31,14 @@
 #define CONFIG_MAX_FPGA_DEVICES                5
 #endif
 
-/* these probably belong somewhere else */
-#ifndef FALSE
-#define FALSE                  (0)
-#endif
-#ifndef TRUE
-#define TRUE                   (!FALSE)
-#endif
-
 /* CONFIG_FPGA bit assignments */
-#define CFG_FPGA_MAN(x)                (x)
-#define CFG_FPGA_DEV(x)                ((x) << 8 )
-#define CFG_FPGA_IF(x)         ((x) << 16 )
+#define CONFIG_SYS_FPGA_MAN(x)         (x)
+#define CONFIG_SYS_FPGA_DEV(x)         ((x) << 8 )
+#define CONFIG_SYS_FPGA_IF(x)          ((x) << 16 )
 
 /* FPGA Manufacturer bits in CONFIG_FPGA */
-#define CFG_FPGA_XILINX                CFG_FPGA_MAN( 0x1 )
-#define CFG_FPGA_ALTERA                CFG_FPGA_MAN( 0x2 )
+#define CONFIG_SYS_FPGA_XILINX         CONFIG_SYS_FPGA_MAN( 0x1 )
+#define CONFIG_SYS_FPGA_ALTERA         CONFIG_SYS_FPGA_MAN( 0x2 )
 
 
 /* fpga_xxxx function return value definitions */
@@ -61,6 +53,7 @@ typedef enum {                        /* typedef fpga_type */
        fpga_min_type,          /* range check value */
        fpga_xilinx,            /* Xilinx Family) */
        fpga_altera,            /* unimplemented */
+       fpga_lattice,           /* Lattice family */
        fpga_undefined          /* invalid range check value */
 } fpga_type;                   /* end, typedef fpga_type */
 
@@ -71,11 +64,11 @@ typedef struct {            /* typedef fpga_desc */
 
 
 /* root function definitions */
-extern void fpga_init( ulong reloc_off );
-extern int fpga_add( fpga_type devtype, void *desc );
-extern int fpga_count( void );
-extern int fpga_load( int devnum, void *buf, size_t bsize );
-extern int fpga_dump( int devnum, void *buf, size_t bsize );
-extern int fpga_info( int devnum );
+extern void fpga_init(void);
+extern int fpga_add(fpga_type devtype, void *desc);
+extern int fpga_count(void);
+extern int fpga_load(int devnum, const void *buf, size_t bsize);
+extern int fpga_dump(int devnum, const void *buf, size_t bsize);
+extern int fpga_info(int devnum);
 
 #endif /* _FPGA_H_ */