summaryrefslogtreecommitdiff
path: root/board/xilinx/xupv2p/xparameters.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-13 09:42:35 -0700
committerWolfgang Denk <wd@denx.de>2008-04-13 09:42:35 -0700
commit8c8428a576f632745306e288b629e30d420c0f5a (patch)
tree4ff35844d49c2278891d74bb37ff0928ec911b82 /board/xilinx/xupv2p/xparameters.h
parent7754f33c6fb7a2c050388d20bf3847038558bdcf (diff)
parentd6f98e76a0a7db415e39c94bf3d2ad539ca9c60d (diff)
downloadu-boot-imx-8c8428a576f632745306e288b629e30d420c0f5a.zip
u-boot-imx-8c8428a576f632745306e288b629e30d420c0f5a.tar.gz
u-boot-imx-8c8428a576f632745306e288b629e30d420c0f5a.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/xilinx/xupv2p/xparameters.h')
-rw-r--r--board/xilinx/xupv2p/xparameters.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/board/xilinx/xupv2p/xparameters.h b/board/xilinx/xupv2p/xparameters.h
index a96c693..9e5ebda 100644
--- a/board/xilinx/xupv2p/xparameters.h
+++ b/board/xilinx/xupv2p/xparameters.h
@@ -37,8 +37,8 @@
#define XILINX_TIMER_IRQ 1
/* Uart pheriphery is RS232_Uart_1 */
-#define XILINX_UART_BASEADDR 0x40600000
-#define XILINX_UART_BAUDRATE 115200
+#define XILINX_UARTLITE_BASEADDR 0x40600000
+#define XILINX_UARTLITE_BAUDRATE 115200
/* GPIO is LEDs_4Bit*/
#define XILINX_GPIO_BASEADDR 0x40000000
@@ -55,10 +55,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