summaryrefslogtreecommitdiff
path: root/include/configs/xupv2p.h
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-09-24 00:08:37 +0200
committerMichal Simek <monstr@monstr.eu>2007-09-24 00:08:37 +0200
commitb90c045f035c3cc9b5d2edaed6048dfb74e40763 (patch)
treeee69b8872cf8c295a48244280c82d98e191111ab /include/configs/xupv2p.h
parent6b6f287a33ae8c340f97fb08ed95b6687e2baa4b (diff)
downloadu-boot-imx-b90c045f035c3cc9b5d2edaed6048dfb74e40763.zip
u-boot-imx-b90c045f035c3cc9b5d2edaed6048dfb74e40763.tar.gz
u-boot-imx-b90c045f035c3cc9b5d2edaed6048dfb74e40763.tar.bz2
synchronizition with mainline
Diffstat (limited to 'include/configs/xupv2p.h')
-rw-r--r--include/configs/xupv2p.h63
1 files changed, 22 insertions, 41 deletions
diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 006a132..35001d7 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -31,34 +31,13 @@
#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_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
@@ -69,13 +48,11 @@
* U-BOOT auto-relocate to TEXT_BASE. After RESET command Microblaze
* jump to CFG_RESET_ADDRESS where is the original U-BOOT code.
*/
-/* #define CFG_RESET_ADDRESS 0x36000000 */
+#define CFG_RESET_ADDRESS 0x36000000
/* gpio */
-#ifdef XILINX_GPIO_BASEADDR
#define CFG_GPIO_0 1
#define CFG_GPIO_0_ADDR XILINX_GPIO_BASEADDR
-#endif
/* interrupt controller */
#define CFG_INTC_0 1
@@ -142,6 +119,7 @@
#define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)
+
/*
* BOOTP options
*/
@@ -150,24 +128,29 @@
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
+
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
-
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_MFSL
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_IMI
+#define CONFIG_CMD_ECHO
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_RUN
+#define CONFIG_CMD_AUTOSCRIPT
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_LOADS
+#define CONFIG_CMD_LOADB
+#define CONFIG_CMD_MISC
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT2
#define CONFIG_CMD_PING
-#ifdef XILINX_SYSACE_BASEADDR
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#endif
/* Miscellaneous configurable options */
#define CFG_PROMPT "U-Boot-mONStR> "
@@ -179,7 +162,7 @@
#define CONFIG_BOOTDELAY 30
#define CONFIG_BOOTARGS "root=romfs"
-#define CONFIG_HOSTNAME "xupv2p"
+#define CONFIG_HOSTNAME "ml401"
#define CONFIG_BOOTCOMMAND "base 0;tftp 11000000 image.img;bootm"
#define CONFIG_IPADDR 192.168.0.3
#define CONFIG_SERVERIP 192.168.0.5
@@ -195,13 +178,11 @@
"echo"
/* system ace */
-#ifdef XILINX_SYSACE_BASEADDR
#define CONFIG_SYSTEMACE
/* #define DEBUG_SYSTEMACE */
#define SYSTEMACE_CONFIG_FPGA
#define CFG_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR
#define CFG_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH
#define CONFIG_DOS_PARTITION
-#endif
#endif /* __CONFIG_H */