rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index f86b3b9..0e33714 100644 (file)
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007 Michal Simek
+ * (C) Copyright 2007-2008 Michal Simek
  *
  * Michal SIMEK <monstr@monstr.eu>
  *
@@ -63,9 +63,11 @@
 /* ethernet */
 #ifdef XILINX_EMAC_BASEADDR
 #define CONFIG_XILINX_EMAC     1
+#define CFG_ENET
 #else
 #ifdef XILINX_EMACLITE_BASEADDR
 #define CONFIG_XILINX_EMACLITE 1
+#define CFG_ENET
 #endif
 #endif
 #undef ET_DEBUG
@@ -77,18 +79,28 @@
 #endif
 
 /* interrupt controller */
+#ifdef XILINX_INTC_BASEADDR
 #define        CFG_INTC_0              1
 #define        CFG_INTC_0_ADDR         XILINX_INTC_BASEADDR
 #define        CFG_INTC_0_NUM          XILINX_INTC_NUM_INTR_INPUTS
+#endif
 
 /* timer */
+#ifdef XILINX_TIMER_BASEADDR
+#if (XILINX_TIMER_IRQ != -1)
 #define        CFG_TIMER_0             1
 #define        CFG_TIMER_0_ADDR        XILINX_TIMER_BASEADDR
 #define        CFG_TIMER_0_IRQ         XILINX_TIMER_IRQ
 #define        FREQUENCE               XILINX_CLOCK_FREQ
 #define        CFG_TIMER_0_PRELOAD     ( FREQUENCE/1000 )
+#endif
+#else
+#ifdef XILINX_CLOCK_FREQ
 #define        CONFIG_XILINX_CLOCK_FREQ        XILINX_CLOCK_FREQ
-
+#else
+#error BAD CLOCK FREQ
+#endif
+#endif
 /*
  * memory layout - Example
  * TEXT_BASE = 0x3600_0000;
@@ -112,7 +124,7 @@
  * 0x3FFB_F000 CFG_MONITOR_BASE
  *                                     MONITOR_CODE    256kB   Env
  * 0x3FFF_F000 CFG_GBL_DATA_OFFSET
- *                                     GLOBAL_DATA     4kB     bd, gd
+ *                                     GLOBAL_DATA     4kB     bd, gd
  * 0x4000_0000 CFG_SDRAM_BASE + CFG_SDRAM_SIZE
  */
 
@@ -138,9 +150,9 @@
 #define        CFG_INIT_SP_OFFSET      CFG_MALLOC_BASE
 
 #define        CFG_NO_FLASH            1
-#define        CFG_ENV_IS_NOWHERE      1
-#define        CFG_ENV_SIZE            0x1000
-#define        CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
+#define        CONFIG_ENV_IS_NOWHERE   1
+#define        CONFIG_ENV_SIZE         0x1000
+#define        CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - CONFIG_ENV_SIZE)
 
 /*
  * BOOTP options
@@ -156,12 +168,18 @@
 #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
+
+#ifndef CFG_ENET
+       #undef CONFIG_CMD_NET
+#else
+       #define CONFIG_CMD_PING
+#endif
 
 #ifdef XILINX_SYSACE_BASEADDR
 #define CONFIG_CMD_EXT2
@@ -176,13 +194,13 @@
 #define        CFG_LONGHELP
 #define        CFG_LOAD_ADDR   0x12000000 /* default load address */
 
-#define        CONFIG_BOOTDELAY        30
+#define        CONFIG_BOOTDELAY        30
 #define        CONFIG_BOOTARGS         "root=romfs"
 #define        CONFIG_HOSTNAME         "xupv2p"
-#define        CONFIG_BOOTCOMMAND      "base 0;tftp 11000000 image.img;bootm"
+#define        CONFIG_BOOTCOMMAND      "base 0;tftp 11000000 image.img;bootm"
 #define        CONFIG_IPADDR           192.168.0.3
-#define        CONFIG_SERVERIP         192.168.0.5
-#define        CONFIG_GATEWAYIP        192.168.0.1
+#define        CONFIG_SERVERIP         192.168.0.5
+#define        CONFIG_GATEWAYIP        192.168.0.1
 #define        CONFIG_ETHADDR          00:E0:0C:00:00:FD
 
 /* architecture dependent code */
@@ -203,4 +221,7 @@
 #define        CONFIG_DOS_PARTITION
 #endif
 
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_OF_LIBFDT       1 /* flat device tree */
+
 #endif /* __CONFIG_H */