mpc83xx: extend CONFIG_SYS_BOOTMAPSZ increase to mpc8308_p1m

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

diff --git a/include/fpga.h b/include/fpga.h
index 52d93b10096517361f50bcd3117671ba1e7957ca..84d7b9fc1ad2d87da31f1aceba9992f4dc9cf2cb 100644 (file)
--- a/include/fpga.h
+++ b/include/fpga.h
@@ -40,13 +40,13 @@
 #endif
 
 /* CONFIG_FPGA bit assignments */
-#define CFG_FPGA_MAN(x)                (x)
-#define CFG_FPGA_DEV(x)                ((x) << 8 )
-#define CFG_FPGA_IF(x)         ((x) << 16 )
+#define CONFIG_SYS_FPGA_MAN(x)         (x)
+#define CONFIG_SYS_FPGA_DEV(x)         ((x) << 8 )
+#define CONFIG_SYS_FPGA_IF(x)          ((x) << 16 )
 
 /* FPGA Manufacturer bits in CONFIG_FPGA */
-#define CFG_FPGA_XILINX                CFG_FPGA_MAN( 0x1 )
-#define CFG_FPGA_ALTERA                CFG_FPGA_MAN( 0x2 )
+#define CONFIG_SYS_FPGA_XILINX         CONFIG_SYS_FPGA_MAN( 0x1 )
+#define CONFIG_SYS_FPGA_ALTERA         CONFIG_SYS_FPGA_MAN( 0x2 )
 
 
 /* fpga_xxxx function return value definitions */
@@ -71,7 +71,7 @@ typedef struct {              /* typedef fpga_desc */
 
 
 /* root function definitions */
-extern void fpga_init( ulong reloc_off );
+extern void fpga_init( void );
 extern int fpga_add( fpga_type devtype, void *desc );
 extern int fpga_count( void );
 extern int fpga_load( int devnum, void *buf, size_t bsize );