[U-Boot-Users] [PATCH] add image size and descriptors for Spartan 3E FPGA chips
Spartan 3E image sizes taken from Table 1-4 in Xilinx UG332 (v1.1)
Signed-off by: Bruce Adler bruce.adler@ccpu.com
diff -pur a/include/spartan3.h b/include/spartan3.h --- a/include/spartan3.h 2007-08-06 23:24:11.000000000 -0700 +++ b/include/spartan3.h 2007-08-06 23:23:06.000000000 -0700 @@ -73,6 +73,13 @@ typedef struct { #define XILINX_XC3S4000_SIZE 11316864/8 #define XILINX_XC3S5000_SIZE 13271936/8
+/* Spartan-3E (v3.4) */ +#define XILINX_XC3S100E_SIZE 581344/8 +#define XILINX_XC3S250E_SIZE 1353728/8 +#define XILINX_XC3S500E_SIZE 2270208/8 +#define XILINX_XC3S1200E_SIZE 3841184/8 +#define XILINX_XC3S1600E_SIZE 5969696/8 + /* Descriptor Macros *********************************************************************/ /* Spartan-II devices */ @@ -100,4 +107,21 @@ typedef struct { #define XILINX_XC3S5000_DESC(iface, fn_table, cookie) \ { Xilinx_Spartan3, iface, XILINX_XC3S5000E_SIZE, fn_table, cookie }
+ +/* Spartan-3E devices */ +#define XILINX_XC3S100E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S100E_SIZE, fn_table, cookie } + +#define XILINX_XC3S250E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S250E_SIZE, fn_table, cookie } + +#define XILINX_XC3S500E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S500E_SIZE, fn_table, cookie } + +#define XILINX_XC3S1200E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S1200E_SIZE, fn_table, cookie } + +#define XILINX_XC3S1600E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S1600E_SIZE, fn_table, cookie } + #endif /* _SPARTAN3_H_ */
In message f99402$c2l$1@sea.gmane.org you wrote:
Spartan 3E image sizes taken from Table 1-4 in Xilinx UG332 (v1.1)
Signed-off by: Bruce Adler bruce.adler@ccpu.com
Patch does not apply to u-boot-testing:
error: patch failed: include/spartan3.h:73 error: include/spartan3.h: patch does not apply fatal: sha1 information is lacking or useless (include/spartan3.h). Patch does not record usable index information. Cannot fall back to three-way merge. Patch failed at 0001.
Trying manually:
patching file include/spartan3.h Hunk #1 FAILED at 73. Hunk #2 FAILED at 107. 2 out of 2 hunks FAILED -- saving rejects to file include/spartan3.h.rej
Please fix and repost.
Best regards,
Wolfgang Denk
[repost, this time without expanding the tabs to whitespace]
Spartan 3E image sizes taken from Table 1-4 in Xilinx UG332 (v1.1)
Signed-off by: Bruce Adler bruce.adler@ccpu.com
diff -ur a/include/spartan3.h b/include/spartan3.h --- a/include/spartan3.h 2007-08-06 23:24:11.000000000 -0700 +++ b/include/spartan3.h 2007-08-06 23:23:06.000000000 -0700 @@ -73,6 +73,13 @@ #define XILINX_XC3S4000_SIZE 11316864/8 #define XILINX_XC3S5000_SIZE 13271936/8
+/* Spartan-3E (v3.4) */ +#define XILINX_XC3S100E_SIZE 581344/8 +#define XILINX_XC3S250E_SIZE 1353728/8 +#define XILINX_XC3S500E_SIZE 2270208/8 +#define XILINX_XC3S1200E_SIZE 3841184/8 +#define XILINX_XC3S1600E_SIZE 5969696/8 + /* Descriptor Macros *********************************************************************/ /* Spartan-II devices */ @@ -100,4 +107,21 @@ #define XILINX_XC3S5000_DESC(iface, fn_table, cookie) \ { Xilinx_Spartan3, iface, XILINX_XC3S5000E_SIZE, fn_table, cookie }
+ +/* Spartan-3E devices */ +#define XILINX_XC3S100E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S100E_SIZE, fn_table, cookie } + +#define XILINX_XC3S250E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S250E_SIZE, fn_table, cookie } + +#define XILINX_XC3S500E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S500E_SIZE, fn_table, cookie } + +#define XILINX_XC3S1200E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S1200E_SIZE, fn_table, cookie } + +#define XILINX_XC3S1600E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S1600E_SIZE, fn_table, cookie } + #endif /* _SPARTAN3_H_ */
In message 46B8AD1C.90003@ccpu.com you wrote:
[repost, this time without expanding the tabs to whitespace]
Spartan 3E image sizes taken from Table 1-4 in Xilinx UG332 (v1.1)
Signed-off by: Bruce Adler bruce.adler@ccpu.com
Still doesn't work for me:
error: patch failed: include/spartan3.h:73 error: include/spartan3.h: patch does not apply fatal: sha1 information is lacking or useless (include/spartan3.h). Patch does not record usable index information. Cannot fall back to three-way merge. Patch failed at 0001.
Please make sure your patch really applies to a current tree....
Best regards,
Wolfgang Denk
Wolfgang Denk wrote:
In message 46B8AD1C.90003@ccpu.com you wrote:
[repost, this time without expanding the tabs to whitespace]
Spartan 3E image sizes taken from Table 1-4 in Xilinx UG332 (v1.1)
Signed-off by: Bruce Adler bruce.adler@ccpu.com
Still doesn't work for me:
error: patch failed: include/spartan3.h:73 error: include/spartan3.h: patch does not apply fatal: sha1 information is lacking or useless (include/spartan3.h). Patch does not record usable index information. Cannot fall back to three-way merge. Patch failed at 0001.
Please make sure your patch really applies to a current tree....
it looks to me like some gateway somewhere is adding an extra blank onto the beginning of any line that starts with a blank
here's the exact same thing as an attachment; I tried this in the junk newsgroup and it seems to make it through without being corrupted
if this doesn't work I'm out of ideas
Signed-off by: Bruce Adler bruce.adler@ccpu.com
diff -ur a/include/spartan3.h b/include/spartan3.h --- a/include/spartan3.h 2007-08-06 23:24:11.000000000 -0700 +++ b/include/spartan3.h 2007-08-06 23:23:06.000000000 -0700 @@ -73,6 +73,13 @@ #define XILINX_XC3S4000_SIZE 11316864/8 #define XILINX_XC3S5000_SIZE 13271936/8
+/* Spartan-3E (v3.4) */ +#define XILINX_XC3S100E_SIZE 581344/8 +#define XILINX_XC3S250E_SIZE 1353728/8 +#define XILINX_XC3S500E_SIZE 2270208/8 +#define XILINX_XC3S1200E_SIZE 3841184/8 +#define XILINX_XC3S1600E_SIZE 5969696/8 + /* Descriptor Macros *********************************************************************/ /* Spartan-II devices */ @@ -100,4 +107,21 @@ #define XILINX_XC3S5000_DESC(iface, fn_table, cookie) \ { Xilinx_Spartan3, iface, XILINX_XC3S5000E_SIZE, fn_table, cookie }
+ +/* Spartan-3E devices */ +#define XILINX_XC3S100E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S100E_SIZE, fn_table, cookie } + +#define XILINX_XC3S250E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S250E_SIZE, fn_table, cookie } + +#define XILINX_XC3S500E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S500E_SIZE, fn_table, cookie } + +#define XILINX_XC3S1200E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S1200E_SIZE, fn_table, cookie } + +#define XILINX_XC3S1600E_DESC(iface, fn_table, cookie) \ +{ Xilinx_Spartan3, iface, XILINX_XC3S1600E_SIZE, fn_table, cookie } + #endif /* _SPARTAN3_H_ */
In message f9imr7$sut$1@sea.gmane.org you wrote:
it looks to me like some gateway somewhere is adding an extra blank onto the beginning of any line that starts with a blank
here's the exact same thing as an attachment; I tried this in the junk newsgroup and it seems to make it through without being corrupted
if this doesn't work I'm out of ideas
It worked fine - thanks for all the efforts with the many reties.
Applied.
Best regards,
Wolfgang Denk
participants (2)
-
Bruce Adler -
Wolfgang Denk