rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

[karo-tx-uboot.git] / include / configs / xupv2p.h

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index 35001d7ada3108e2bcba95505e7571680c1d8a57..7bd142469db76459659095e63235bb11bd66b139 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,24 +58,49 @@
  * 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
+#define CFG_ENET
+#else
+#ifdef XILINX_EMACLITE_BASEADDR
+#define CONFIG_XILINX_EMACLITE 1
+#define CFG_ENET
+#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 */
+#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;
@@ -89,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
  */
 
@@ -115,11 +150,10 @@
 #define        CFG_INIT_SP_OFFSET      CFG_MALLOC_BASE
 
 #define        CFG_NO_FLASH            1
-#define        CFG_ENV_IS_NOWHERE      1
+#define        CONFIG_ENV_IS_NOWHERE   1
 #define        CFG_ENV_SIZE            0x1000
 #define        CFG_ENV_ADDR            (CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
-
 /*
  * BOOTP options
  */
@@ -128,29 +162,29 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
 #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_FAT
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_PING
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_IRQ
 
+#ifndef CFG_ENET
+       #undef CONFIG_CMD_NET
+#else
+       #define CONFIG_CMD_PING
+#endif
+
+#ifdef XILINX_SYSACE_BASEADDR
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#endif
 
 /* Miscellaneous configurable options */
 #define        CFG_PROMPT      "U-Boot-mONStR> "
@@ -160,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         "ml401"
-#define        CONFIG_BOOTCOMMAND      "base 0;tftp 11000000 image.img;bootm"
+#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
-#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 */
@@ -178,11 +212,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 */