X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fspartan3.h;h=b0fa1cdaee6287c9cbef0936176073d4742497b3;hb=9a929170be89b27bce677504da27e88600c06c49;hp=c203eeb580f4870e5b9a3295c7c4f5430d6ee016;hpb=8d79953d03e6c5b24215609997dafe4daa623cd6;p=u-boot

diff --git a/include/spartan3.h b/include/spartan3.h
index c203eeb580..b0fa1cdaee 100644
--- a/include/spartan3.h
+++ b/include/spartan3.h
@@ -47,7 +47,7 @@ typedef struct {
 	Xilinx_busy_fn	busy;
 	Xilinx_abort_fn	abort;
 	Xilinx_post_fn	post;
-	int           	relocated;
+	int		relocated;
 } Xilinx_Spartan3_Slave_Parallel_fns;
 
 /* Slave Serial Implementation function table */
@@ -59,20 +59,20 @@ typedef struct {
 	Xilinx_done_fn	done;
 	Xilinx_wr_fn	wr;
 	Xilinx_post_fn	post;
-	int           	relocated;
+	int		relocated;
 } Xilinx_Spartan3_Slave_Serial_fns;
 
 /* Device Image Sizes
  *********************************************************************/
 /* Spartan-III (1.2V) */
-#define XILINX_XC3S50_SIZE  	439264/8
-#define XILINX_XC3S200_SIZE  	1047616/8
-#define XILINX_XC3S400_SIZE  	1699136/8
-#define XILINX_XC3S1000_SIZE 	3223488/8
-#define XILINX_XC3S1500_SIZE 	5214784/8
-#define XILINX_XC3S2000_SIZE 	7673024/8
-#define XILINX_XC3S4000_SIZE 	11316864/8
-#define XILINX_XC3S5000_SIZE 	13271936/8
+#define XILINX_XC3S50_SIZE	439264/8
+#define XILINX_XC3S200_SIZE	1047616/8
+#define XILINX_XC3S400_SIZE	1699136/8
+#define XILINX_XC3S1000_SIZE	3223488/8
+#define XILINX_XC3S1500_SIZE	5214784/8
+#define XILINX_XC3S2000_SIZE	7673024/8
+#define XILINX_XC3S4000_SIZE	11316864/8
+#define XILINX_XC3S5000_SIZE	13271936/8
 
 /* Spartan-3E (v3.4) */
 #define	XILINX_XC3S100E_SIZE	581344/8
@@ -81,9 +81,6 @@ typedef struct {
 #define	XILINX_XC3S1200E_SIZE	3841184/8
 #define	XILINX_XC3S1600E_SIZE	5969696/8
 
-/* Spartan-IIIE (1.2V) */
-#define XILINX_XC3S1200E_SIZE  	3841184/8
-
 /* Descriptor Macros
  *********************************************************************/
 /* Spartan-III devices */
@@ -103,14 +100,13 @@ typedef struct {
 { Xilinx_Spartan3, iface, XILINX_XC3S1500_SIZE, fn_table, cookie }
 
 #define XILINX_XC3S2000_DESC(iface, fn_table, cookie) \
-{ Xilinx_Spartan3, iface, XILINX_XC3S2000E_SIZE, fn_table, cookie }
+{ Xilinx_Spartan3, iface, XILINX_XC3S2000_SIZE, fn_table, cookie }
 
 #define XILINX_XC3S4000_DESC(iface, fn_table, cookie) \
-{ Xilinx_Spartan3, iface, XILINX_XC3S4000E_SIZE, fn_table, cookie }
+{ Xilinx_Spartan3, iface, XILINX_XC3S4000_SIZE, fn_table, cookie }
 
 #define XILINX_XC3S5000_DESC(iface, fn_table, cookie) \
-{ Xilinx_Spartan3, iface, XILINX_XC3S5000E_SIZE, fn_table, cookie }
-
+{ Xilinx_Spartan3, iface, XILINX_XC3S5000_SIZE, fn_table, cookie }
 
 /* Spartan-3E devices */
 #define XILINX_XC3S100E_DESC(iface, fn_table, cookie) \
@@ -128,9 +124,4 @@ typedef struct {
 #define XILINX_XC3S1600E_DESC(iface, fn_table, cookie) \
 { Xilinx_Spartan3, iface, XILINX_XC3S1600E_SIZE, fn_table, cookie }
 
-
-/* Spartan-IIIE devices */
-#define XILINX_XC3S1200E_DESC(iface, fn_table, cookie) \
-{ Xilinx_Spartan3, iface, XILINX_XC3S1200E_SIZE, fn_table, cookie }
-
 #endif /* _SPARTAN3_H_ */