rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 99e7868f9c93b27d45c3ce8852bfd8a50d4d0d80..5368ac8e5e12ab18bcc928f8b2c3b7b642acb09b 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2003
+ * (C) Copyright 2003-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -33,15 +33,10 @@
 
 #ifndef        CPU_CLOCK_RATE
 /* allowed values: 100000000, 133000000, and 150000000 */
-#define CPU_CLOCK_RATE 133000000       /* 133 MHz clock for the MIPS core */
-#endif
-
-#if CPU_CLOCK_RATE == 100000000
-#define INFINEON_EBU_BOOTCFG   0x20C4  /* CMULT = 4 for 100 MHz */
-#else
-#define INFINEON_EBU_BOOTCFG   0x40C4  /* CMULT = 8 for 150 MHz */
+#define CPU_CLOCK_RATE 150000000       /* default: 150 MHz clock for the MIPS core */
 #endif
 
+#define INFINEON_EBU_BOOTCFG   0x40C4  /* CMULT = 8 */
 
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
@@ -53,44 +48,62 @@
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off\0"                          \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
-               "ethaddr=$(ethaddr) "                                   \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off\0"                          \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
+               "ethaddr=${ethaddr} "                                   \
                "panic=1\0"                                             \
        "flash_nfs=run nfsargs addip addmisc;"                          \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addmisc;"                         \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 80500000 $(bootfile);"                            \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 80500000 ${bootfile};"                            \
                "run nfsargs addip addmisc;bootm\0"                     \
        "rootpath=/opt/eldk/mips_4KC\0"                                 \
        "bootfile=/tftpboot/INCA/uImage\0"                              \
        "kernel_addr=B0040000\0"                                        \
        "ramdisk_addr=B0100000\0"                                       \
        "u-boot=/tftpboot/INCA/u-boot.bin\0"                            \
-       "load=tftp 80500000 $(u-boot)\0"                                \
+       "load=tftp 80500000 ${u-boot}\0"                                \
        "update=protect off 1:0-2;era 1:0-2;"                           \
-               "cp.b 80500000 B0000000 $(filesize)\0"                  \
+               "cp.b 80500000 B0000000 ${filesize}\0"                  \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_ASKENV | \
-                                CFG_CMD_DHCP   | \
-                                CFG_CMD_ELF    )
-#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>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_NFS
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SNTP
+
 
 /*
  * Miscellaneous configurable options
@@ -105,7 +118,9 @@
 
 #define CFG_BOOTPARAMS_LEN     128*1024
 
-#define CFG_HZ                 (CPU_CLOCK_RATE/2)
+#define CFG_MIPS_TIMER_FREQ    (incaip_get_cpuclk() / 2)
+
+#define CFG_HZ                 1000
 
 #define CFG_SDRAM_BASE         0x80000000
 
@@ -135,11 +150,11 @@
 #define CFG_FLASH_ERASE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
-#define CFG_ENV_ADDR           0xB0030000
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_ADDR                0xB0030000
+#define CONFIG_ENV_SIZE                0x10000
 
 #define CONFIG_FLASH_16BIT
 
@@ -147,6 +162,28 @@
 
 #define CONFIG_INCA_IP_SWITCH
 #define CONFIG_NET_MULTI
+#define CONFIG_INCA_IP_SWITCH_AMDIX
+
+/*
+ * JFFS2 partitions
+ */
+/* No command line, one static partition, use all space on the device */
+#undef CONFIG_JFFS2_CMDLINE
+#define CONFIG_JFFS2_DEV               "nor1"
+#define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
+#define CONFIG_JFFS2_PART_OFFSET       0x00000000
+
+/* mtdparts command line support */
+/*
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor0=INCA-IP Bank 0"
+#define MTDPARTS_DEFAULT       "mtdparts=INCA-IP Bank 0:192k(uboot)," \
+                                                       "64k(env)," \
+                                                       "768k(linux)," \
+                                                       "1m@3m(rootfs)," \
+                                                       "768k(linux2)," \
+                                                       "3m@5m(rootfs2)"
+*/
 
 /*-----------------------------------------------------------------------
  * Cache Configuration