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

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

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index b4c720d18b55f3ec507c1558b07f0e9aabc00373..30fb303c9613c01a8167e12fb6dbaea19574d735 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-2008 Michal Simek
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
@@ -31,13 +31,23 @@
 #define        CONFIG_XUPV2P           1
 
 /* uart */
-#define        CONFIG_SERIAL_BASE      XILINX_UART_BASEADDR
-#define        CONFIG_BAUDRATE         XILINX_UART_BAUDRATE
+#ifdef XILINX_UARTLITE_BASEADDR
+#define        CONFIG_XILINX_UARTLITE
+#define        CONFIG_SERIAL_BASE      XILINX_UARTLITE_BASEADDR
+#define        CONFIG_BAUDRATE         XILINX_UARTLITE_BAUDRATE
 #define        CFG_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
-
-/* ethernet */
-#define CONFIG_EMAC    1
-#define XPAR_EMAC_0_DEVICE_ID  XPAR_XEMAC_NUM_INSTANCES
+#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
 
 /*
  * setting reset address
@@ -48,11 +58,23 @@
  * 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 */
+
+/* ethernet */
+#ifdef XILINX_EMAC_BASEADDR
+#define CONFIG_XILINX_EMAC     1
+#else
+#ifdef XILINX_EMACLITE_BASEADDR
+#define CONFIG_XILINX_EMACLITE 1
+#endif
+#endif
+#undef ET_DEBUG
 
 /* 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
@@ -65,6 +87,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
@@ -118,27 +141,33 @@
 #define        CFG_ENV_IS_NOWHERE      1
 #define        CFG_ENV_SIZE            0x1000
 #define        CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
-#define        CONFIG_COMMANDS (CONFIG__CMD_DFL |\
-                       CFG_CMD_MEMORY |\
-                       CFG_CMD_IRQ |\
-                       CFG_CMD_BDI |\
-                       CFG_CMD_NET |\
-                       CFG_CMD_IMI |\
-                       CFG_CMD_ECHO |\
-                       CFG_CMD_CACHE |\
-                       CFG_CMD_RUN |\
-                       CFG_CMD_AUTOSCRIPT |\
-                       CFG_CMD_ASKENV |\
-                       CFG_CMD_LOADS |\
-                       CFG_CMD_LOADB |\
-                       CFG_CMD_MISC |\
-                       CFG_CMD_FAT |\
-                       CFG_CMD_EXT2 |\
-                       CFG_CMD_PING \
-                       )
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_JFFS2
+#undef CONFIG_CMD_IMLS
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_IRQ
+#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> "
@@ -150,7 +179,7 @@
 
 #define        CONFIG_BOOTDELAY        30
 #define        CONFIG_BOOTARGS         "root=romfs"
-#define        CONFIG_HOSTNAME         "ml401"
+#define        CONFIG_HOSTNAME         "xupv2p"
 #define        CONFIG_BOOTCOMMAND      "base 0;tftp 11000000 image.img;bootm"
 #define        CONFIG_IPADDR           192.168.0.3
 #define        CONFIG_SERVERIP         192.168.0.5
@@ -166,11 +195,16 @@
        "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
+
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_OF_LIBFDT       1 /* flat device tree */
 
 #endif /* __CONFIG_H */