Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

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

diff --git a/include/ACEX1K.h b/include/ACEX1K.h
index f249d6402d2e2837e8f0d8977d92e063fa164ef9..ae201647be7a9837b9695f046d6e79675da9a6ce 100644 (file)
--- a/include/ACEX1K.h
+++ b/include/ACEX1K.h
@@ -33,12 +33,10 @@
 extern int ACEX1K_load( Altera_desc *desc, void *image, size_t size );
 extern int ACEX1K_dump( Altera_desc *desc, void *buf, size_t bsize );
 extern int ACEX1K_info( Altera_desc *desc );
-extern int ACEX1K_reloc( Altera_desc *desc, ulong reloc_off );
 
 extern int CYC2_load( Altera_desc *desc, void *image, size_t size );
 extern int CYC2_dump( Altera_desc *desc, void *buf, size_t bsize );
 extern int CYC2_info( Altera_desc *desc );
-extern int CYC2_reloc( Altera_desc *desc, ulong reloc_off );
 
 /* Slave Serial Implementation function table */
 typedef struct {
@@ -50,7 +48,6 @@ typedef struct {
        Altera_data_fn          data;
        Altera_abort_fn         abort;
        Altera_post_fn          post;
-       int                     relocated;
 } Altera_ACEX1K_Passive_Serial_fns;
 
 /* Slave Serial Implementation function table */
@@ -62,7 +59,6 @@ typedef struct {
        Altera_write_fn         write;
        Altera_abort_fn         abort;
        Altera_post_fn          post;
-       int                     relocated;
 } Altera_CYC2_Passive_Serial_fns;
 
 /* Device Image Sizes
@@ -73,10 +69,12 @@ typedef struct {
  * Filesize of an *.rbf file is 166965 Bytes
  */
 #if 0
-#define Altera_EP1K100_SIZE    1337000/8       /* 167125 Bytes */
+#define Altera_EP1K100_SIZE    1337000/8       /* 167125 Bytes */
 #endif
-#define Altera_EP1K100_SIZE    (166965*8)
+#define Altera_EP1K100_SIZE    (166965*8)
 
+#define Altera_EP2C8_SIZE      247942
+#define Altera_EP2C20_SIZE     586562
 #define Altera_EP2C35_SIZE     883905
 
 /* Descriptor Macros