* Vince Husovsky, 7 Nov 2002:
  Add "-n" to linker options to get rid of "Not enough room for
  program headers" problem

* Patch by David Müller, 05 Nov 2002
  Rename CONFIG_PLL_INPUT_FREQ to CONFIG_SYS_CLK_FREQ
  so we can use an already existing name

* Patch by Pierre Aubert, 05 Nov 2002
  Hardware related improvements in FDC boot code

* Patch by Holger Schurig, 5 Nov 2002:
  Make the PXA really change it's frequency

* Patch by Pierre Aubert, 05 Nov 2002
  Add support for slave serial Spartan 2 FPGAs

* Fix uninitialized memory (MAC address) in 8xx SCC/FEC ethernet
  drivers
diff --git a/include/common.h b/include/common.h
index 49ab97c..21101f1 100644
--- a/include/common.h
+++ b/include/common.h
@@ -156,6 +156,7 @@
 
 /* $(BOARD)/$(BOARD).c */
 void	reset_phy     (void);
+void    fdc_hw_init   (void);
 
 /* $(BOARD)/eeprom.c */
 void eeprom_init  (void);
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index 543dfb0..c60e746 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -43,7 +43,7 @@
 #define CONFIG_SMDK2400		1	/* on an SAMSUNG SMDK2400 Board */
 
 /* input clock of PLL */
-#define CONFIG_PLL_INPUT_FREQ	12000000 /* SMDK2400 has 12 MHz input clock */
+#define CONFIG_SYS_CLK_FREQ	12000000 /* SMDK2400 has 12 MHz input clock */
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 
 #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 766b8fe..65dd3fe 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -44,7 +44,7 @@
 #define CONFIG_SMDK2410		1	/* on a SAMSUNG SMDK2410 Board  */
 
 /* input clock of PLL */
-#define CONFIG_PLL_INPUT_FREQ	12000000/* the SMDK2410 has 12MHz input clock */
+#define CONFIG_SYS_CLK_FREQ	12000000/* the SMDK2410 has 12MHz input clock */
 
 
 #define USE_920T_MMU		1
diff --git a/include/configs/trab.h b/include/configs/trab.h
index b7a27c6..c614411 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -42,7 +42,7 @@
 #undef CONFIG_TRAB_50MHZ		/* run the CPU at 50 MHz */
 
 /* input clock of PLL */
-#define CONFIG_PLL_INPUT_FREQ	12000000 /* TRAB has 12 MHz input clock */
+#define CONFIG_SYS_CLK_FREQ	12000000 /* TRAB has 12 MHz input clock */
 
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
 
diff --git a/include/spartan2.h b/include/spartan2.h
index 42806e3..a04aaca 100644
--- a/include/spartan2.h
+++ b/include/spartan2.h
@@ -52,10 +52,12 @@
 
 /* Slave Serial Implementation function table */
 typedef struct {
+	Xilinx_pre_fn	pre;
 	Xilinx_pgm_fn	pgm;
 	Xilinx_clk_fn	clk;
-	Xilinx_rdata_fn	rdata;
-	Xilinx_wdata_fn	wdata;
+	Xilinx_init_fn	init;
+	Xilinx_done_fn	done;
+	Xilinx_wr_fn	wr;
 	int           	relocated;
 } Xilinx_Spartan2_Slave_Serial_fns;