summaryrefslogtreecommitdiff
path: root/include/ACEX1K.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
committerWolfgang Denk <wd@denx.de>2009-10-09 00:03:18 +0200
commitcd77dd109c4a439519a78c32eddc42bdebc7a61f (patch)
treec5534647cb1786044ef0f7e4ad4067725eddf11d /include/ACEX1K.h
parent95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff)
parentafc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff)
downloadu-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip
u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.gz
u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.bz2
Merge branch 'reloc'
Diffstat (limited to 'include/ACEX1K.h')
-rw-r--r--include/ACEX1K.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/ACEX1K.h b/include/ACEX1K.h
index 354e0f0..ae20164 100644
--- 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