Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash

[oweals/u-boot.git] / board / xilinx / ml401 / xparameters.h

diff --git a/board/xilinx/ml401/xparameters.h b/board/xilinx/ml401/xparameters.h
index 1a116ead1b78c211e93c5f3fd8d7e00508f82885..d805061c0d01b17d20d91f57db931685f9ef6bc8 100644 (file)
--- a/board/xilinx/ml401/xparameters.h
+++ b/board/xilinx/ml401/xparameters.h
@@ -41,8 +41,8 @@
 #define XILINX_TIMER_IRQ       0
 
 /* Uart pheriphery is RS232_Uart */
-#define XILINX_UART_BASEADDR   0x40600000
-#define XILINX_UART_BAUDRATE   115200
+#define XILINX_UARTLITE_BASEADDR       0x40600000
+#define XILINX_UARTLITE_BAUDRATE       115200
 
 /* IIC pheriphery is IIC_EEPROM */
 #define XILINX_IIC_0_BASEADDR  0x40800000
@@ -66,10 +66,4 @@
 #define XILINX_SYSACE_MEM_WIDTH        16
 
 /* Ethernet controller is Ethernet_MAC */
-#define XPAR_XEMAC_NUM_INSTANCES       1
-#define XPAR_OPB_ETHERNET_0_DEVICE_ID  0
-#define XPAR_OPB_ETHERNET_0_BASEADDR   0x40c00000
-#define XPAR_OPB_ETHERNET_0_HIGHADDR   0x40c0ffff
-#define XPAR_OPB_ETHERNET_0_DMA_PRESENT        1
-#define XPAR_OPB_ETHERNET_0_ERR_COUNT_EXIST    1
-#define XPAR_OPB_ETHERNET_0_MII_EXIST  1
+#define XILINX_EMACLITE_BASEADDR       0x40C00000