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 b93b3876bc21be514dd324bd1282fe32f3e1f5c2..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>
  *
@@ -32,7 +32,7 @@
 
 /* uart */
 #ifdef XILINX_UARTLITE_BASEADDR
-#define        XILINX_UARTLITE
+#define        CONFIG_XILINX_UARTLITE
 #define        CONFIG_SERIAL_BASE      XILINX_UARTLITE_BASEADDR
 #define        CONFIG_BAUDRATE         XILINX_UARTLITE_BAUDRATE
 #define        CFG_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
@@ -44,22 +44,11 @@
 #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
-
 /*
  * setting reset address
  *
@@ -71,6 +60,16 @@
  */
 /* #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
@@ -88,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
@@ -155,21 +155,14 @@
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_IRQ
-#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
+#undef CONFIG_CMD_FLASH
+#undef CONFIG_CMD_JFFS2
+#undef CONFIG_CMD_IMLS
+
 #define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_LOADS
-#define CONFIG_CMD_LOADB
-#define CONFIG_CMD_MISC
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_IRQ
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_MFSL
 
 #ifdef XILINX_SYSACE_BASEADDR
 #define CONFIG_CMD_EXT2
@@ -211,4 +204,7 @@
 #define        CONFIG_DOS_PARTITION
 #endif
 
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_OF_LIBFDT       1 /* flat device tree */
+
 #endif /* __CONFIG_H */