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

[platform/kernel/u-boot.git] / include / lattice.h

diff --git a/include/lattice.h b/include/lattice.h
old mode 100755 (executable)
new mode 100644 (file)
index 33d2ac3..49871da
--- a/include/lattice.h
+++ b/include/lattice.h
@@ -278,9 +278,6 @@ typedef struct {
        char            *desc;  /* description string */
 } Lattice_desc;                        /* end, typedef Altera_desc */
 
-/* Lattice Model Type */
-#define CONFIG_SYS_XP2         CONFIG_SYS_FPGA_DEV(0x1)
-
 /* Board specific implementation specific function types */
 typedef void (*Lattice_jtag_init)(void);
 typedef void (*Lattice_jtag_set_tdi)(int v);
@@ -302,12 +299,13 @@ void sclock(void);
 void ispVMDelay(unsigned short int a_usMicroSecondDelay);
 void calibration(void);
 
-int lattice_load(Lattice_desc *desc, void *buf, size_t bsize);
-int lattice_dump(Lattice_desc *desc, void *buf, size_t bsize);
+int lattice_load(Lattice_desc *desc, const void *buf, size_t bsize);
+int lattice_dump(Lattice_desc *desc, const void *buf, size_t bsize);
 int lattice_info(Lattice_desc *desc);
 
 void ispVMStart(void);
 void ispVMEnd(void);
+extern void ispVMFreeMem(void);
 signed char ispVMCode(void);
 void ispVMDelay(unsigned short int a_usMicroSecondDelay);
 void ispVMCalculateCRC32(unsigned char a_ucData);
@@ -316,4 +314,3 @@ void writePort(unsigned char pins, unsigned char value);
 unsigned char readPort(void);
 void sclock(void);
 #endif
-