Merge branch 'master' of /home/stefan/git/u-boot/u-boot into for-1.3.2-ver2

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

diff --git a/board/xilinx/xupv2p/xparameters.h b/board/xilinx/xupv2p/xparameters.h
index 0bb7a805f4a9005088c103e0c74e6678c0d7eac4..a96c693c551eeaa0bddf1365ed8524c4ad1a3c36 100644 (file)
--- a/board/xilinx/xupv2p/xparameters.h
+++ b/board/xilinx/xupv2p/xparameters.h
@@ -28,24 +28,17 @@
 /* System Clock Frequency */
 #define XILINX_CLOCK_FREQ      100000000
 
-/* Microblaze is microblaze_0 */
-#define XILINX_USE_MSR_INSTR   1
-#define XILINX_PVR     0
-#define XILINX_FSL_NUMBER      0
-
 /* Interrupt controller is opb_intc_0 */
 #define XILINX_INTC_BASEADDR   0x41200000
-#define XILINX_INTC_NUM_INTR_INPUTS    7
+#define XILINX_INTC_NUM_INTR_INPUTS    11
 
 /* Timer pheriphery is opb_timer_1 */
 #define XILINX_TIMER_BASEADDR  0x41c00000
-#define XILINX_TIMER_IRQ       0
+#define XILINX_TIMER_IRQ       1
 
 /* Uart pheriphery is RS232_Uart_1 */
-#define XILINX_UARTLITE_BASEADDR       0x40600000
-#define XILINX_UARTLITE_BAUDRATE       115200
-
-/* IIC doesn't exist */
+#define XILINX_UART_BASEADDR   0x40600000
+#define XILINX_UART_BAUDRATE   115200
 
 /* GPIO is LEDs_4Bit*/
 #define XILINX_GPIO_BASEADDR   0x40000000
@@ -58,10 +51,14 @@
 
 /* Sysace Controller is SysACE_CompactFlash */
 #define XILINX_SYSACE_BASEADDR 0x41800000
+#define XILINX_SYSACE_HIGHADDR 0x4180ffff
 #define XILINX_SYSACE_MEM_WIDTH        16
 
 /* Ethernet controller is Ethernet_MAC */
-#define XILINX_EMAC_BASEADDR   0x40c00000
-#define XILINX_EMAC_DMA_PRESENT        3
-#define XILINX_EMAC_HALF_DUPLEX_EXIST  1
-#define XILINX_EMAC_MII_EXIST  1
+#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