Merge branch 'i2c'

[u-boot] / include / spartan2.h

diff --git a/include/spartan2.h b/include/spartan2.h
index 42806e3ae2c06696e3e25b3fb2d06899f458360e..d2e81e38ab5bae6a019c75fec42332afe77fe729 100644 (file)
--- a/include/spartan2.h
+++ b/include/spartan2.h
@@ -52,10 +52,12 @@ typedef struct {
 
 /* Slave Serial Implementation function table */
 typedef struct {
+       Xilinx_pre_fn   pre;
        Xilinx_pgm_fn   pgm;
        Xilinx_clk_fn   clk;
-       Xilinx_rdata_fn rdata;
-       Xilinx_wdata_fn wdata;
+       Xilinx_init_fn  init;
+       Xilinx_done_fn  done;
+       Xilinx_wr_fn    wr;
        int             relocated;
 } Xilinx_Spartan2_Slave_Serial_fns;
 
@@ -68,6 +70,13 @@ typedef struct {
 #define XILINX_XC2S100_SIZE    781248/8
 #define XILINX_XC2S150_SIZE    1040128/8
 
+/* Spartan-IIE (1.8V) */
+#define XILINX_XC2S50E_SIZE     630048/8
+#define XILINX_XC2S100E_SIZE    863840/8
+#define XILINX_XC2S150E_SIZE    1134496/8
+#define XILINX_XC2S200E_SIZE    1442016/8
+#define XILINX_XC2S300E_SIZE    1875648/8
+
 /* Descriptor Macros
  *********************************************************************/
 /* Spartan-II devices */
@@ -86,5 +95,19 @@ typedef struct {
 #define XILINX_XC2S150_DESC(iface, fn_table, cookie) \
 { Xilinx_Spartan2, iface, XILINX_XC2S150_SIZE, fn_table, cookie }
 
-#endif /* _SPARTAN2_H_ */
+#define XILINX_XC2S50E_DESC(iface, fn_table, cookie) \
+{ Xilinx_Spartan2, iface, XILINX_XC2S50E_SIZE, fn_table, cookie }
+
+#define XILINX_XC2S100E_DESC(iface, fn_table, cookie) \
+{ Xilinx_Spartan2, iface, XILINX_XC2S100E_SIZE, fn_table, cookie }
+
+#define XILINX_XC2S150E_DESC(iface, fn_table, cookie) \
+{ Xilinx_Spartan2, iface, XILINX_XC2S150E_SIZE, fn_table, cookie }
 
+#define XILINX_XC2S200E_DESC(iface, fn_table, cookie) \
+{ Xilinx_Spartan2, iface, XILINX_XC2S200E_SIZE, fn_table, cookie }
+
+#define XILINX_XC2S300E_DESC(iface, fn_table, cookie) \
+{ Xilinx_Spartan2, iface, XILINX_XC2S300E_SIZE, fn_table, cookie }
+
+#endif /* _SPARTAN2_H_ */