Merge git://www.denx.de/git/u-boot

[oweals/u-boot.git] / include / configs / xupv2p.h

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 006a132881d86b5802943a069cc17d0b5e193871..c9320c287c2273e6608150cbd8f216214070450f 100644 (file)
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007 Czech Technical University.
+ * (C) Copyright 2007 Michal Simek
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
@@ -31,34 +31,14 @@
 #define        CONFIG_XUPV2P           1
 
 /* uart */
-#ifdef XILINX_UARTLITE_BASEADDR
-#define        XILINX_UARTLITE
-#define        CONFIG_SERIAL_BASE      XILINX_UARTLITE_BASEADDR
-#define        CONFIG_BAUDRATE         XILINX_UARTLITE_BAUDRATE
+#define        CONFIG_XILINX_UARTLITE
+#define        CONFIG_SERIAL_BASE      XILINX_UART_BASEADDR
+#define        CONFIG_BAUDRATE         XILINX_UART_BAUDRATE
 #define        CFG_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
-#else
-#ifdef XILINX_UART16550_BASEADDR
-#define CFG_NS16550
-#define CFG_NS16550_SERIAL
-#define CFG_NS16550_REG_SIZE   4
-#define CONFIG_CONS_INDEX      1
-#define CFG_NS16550_COM1       XILINX_UART16550_BASEADDR
-#define CFG_NS16550_CLK                XILINX_UART16550_CLOCK_HZ
-
-#define        CONFIG_BAUDRATE         115200
-#define        CFG_BAUDRATE_TABLE      { 9600, 115200 }
-#endif
-#endif
 
 /* ethernet */
-#ifdef XILINX_EMAC_BASEADDR
-#define XILINX_EMAC    1
-#else
-#ifdef XILINX_EMACLITE_BASEADDR
-#define XILINX_EMACLITE        1
-#endif
-#endif
-#undef ET_DEBUG
+#define CONFIG_EMAC    1
+#define XPAR_EMAC_0_DEVICE_ID  XPAR_XEMAC_NUM_INSTANCES
 
 /*
  * setting reset address
@@ -88,6 +68,7 @@
 #define        CFG_TIMER_0_IRQ         XILINX_TIMER_IRQ
 #define        FREQUENCE               XILINX_CLOCK_FREQ
 #define        CFG_TIMER_0_PRELOAD     ( FREQUENCE/1000 )
+#define        CONFIG_XILINX_CLOCK_FREQ        XILINX_CLOCK_FREQ
 
 /*
  * memory layout - Example
@@ -161,7 +142,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_MFSL
 #define CONFIG_CMD_PING
 
 #ifdef XILINX_SYSACE_BASEADDR