Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

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

diff --git a/include/altera.h b/include/altera.h
index 7b8cb4a55d6b478fbe53d1bb45a042c10bad0b3d..6aad5ee868d2796424c417986d9527dc5bf36727 100644 (file)
--- a/include/altera.h
+++ b/include/altera.h
@@ -27,24 +27,6 @@
 #ifndef _ALTERA_H_
 #define _ALTERA_H_
 
-/*
- * See include/xilinx.h for another working example.
- */
-
-/* Altera Model definitions
- *********************************************************************/
-#define CFG_ACEX1K             CFG_FPGA_DEV( 0x1 )
-#define CFG_CYCLON2            CFG_FPGA_DEV( 0x2 )
-
-#define CFG_ALTERA_ACEX1K      (CFG_FPGA_ALTERA | CFG_ACEX1K)
-#define CFG_ALTERA_CYCLON2     (CFG_FPGA_ALTERA | CFG_CYCLON2)
-/* Add new models here */
-
-/* Altera Interface definitions
- *********************************************************************/
-#define CFG_ALTERA_IF_PS       CFG_FPGA_IF( 0x1 )      /* passive serial */
-/* Add new interfaces here */
-
 typedef enum {                         /* typedef Altera_iface */
        min_altera_iface_type,          /* insert all new types after this */
        passive_serial,                 /* serial data and external clock */
@@ -52,15 +34,18 @@ typedef enum {                              /* typedef Altera_iface */
        passive_parallel_asynchronous,  /* parallel data */
        passive_serial_asynchronous,    /* serial data w/ internal clock (not used)     */
        altera_jtag_mode,               /* jtag/tap serial (not used ) */
+       fast_passive_parallel,          /* fast passive parallel (FPP) */
+       fast_passive_parallel_security, /* fast passive parallel with security (FPPS) */
        max_altera_iface_type           /* insert all new types before this */
 } Altera_iface;                                /* end, typedef Altera_iface */
 
 typedef enum {                 /* typedef Altera_Family */
-    min_altera_type,           /* insert all new types after this */
-    Altera_ACEX1K,             /* ACEX1K Family */
-    Altera_CYC2,               /* CYCLONII Family */
+       min_altera_type,        /* insert all new types after this */
+       Altera_ACEX1K,          /* ACEX1K Family */
+       Altera_CYC2,            /* CYCLONII Family */
+       Altera_StratixII,       /* StratixII Familiy */
 /* Add new models here */
-    max_altera_type            /* insert all new types before this */
+       max_altera_type         /* insert all new types before this */
 } Altera_Family;               /* end, typedef Altera_Family */
 
 typedef struct {               /* typedef Altera_desc */
@@ -74,10 +59,9 @@ typedef struct {             /* typedef Altera_desc */
 
 /* Generic Altera Functions
  *********************************************************************/
-extern int altera_load( Altera_desc *desc, void *image, size_t size );
-extern int altera_dump( Altera_desc *desc, void *buf, size_t bsize );
-extern int altera_info( Altera_desc *desc );
-extern int altera_reloc( Altera_desc *desc, ulong reloc_offset );
+extern int altera_load(Altera_desc *desc, const void *image, size_t size);
+extern int altera_dump(Altera_desc *desc, const void *buf, size_t bsize);
+extern int altera_info(Altera_desc *desc);
 
 /* Board specific implementation specific function types
  *********************************************************************/
@@ -87,8 +71,19 @@ typedef int (*Altera_status_fn)( int cookie );
 typedef int (*Altera_done_fn)( int cookie );
 typedef int (*Altera_clk_fn)( int assert_clk, int flush, int cookie );
 typedef int (*Altera_data_fn)( int assert_data, int flush, int cookie );
-typedef int (*Altera_write_fn)(void *buf, size_t len, int flush, int cookie);
+typedef int(*Altera_write_fn)(const void *buf, size_t len, int flush, int cookie);
 typedef int (*Altera_abort_fn)( int cookie );
 typedef int (*Altera_post_fn)( int cookie );
 
+typedef struct {
+       Altera_pre_fn pre;
+       Altera_config_fn config;
+       Altera_status_fn status;
+       Altera_done_fn done;
+       Altera_clk_fn clk;
+       Altera_data_fn data;
+       Altera_abort_fn abort;
+       Altera_post_fn post;
+} altera_board_specific_func;
+
 #endif /* _ALTERA_H_ */