Change all '$(...)' variable references into '${...}'
[platform/kernel/u-boot.git] / include / configs / trab.h
index 6884270..85ee756 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2002-2003
+ * (C) Copyright 2002-2005
  * Gary Jennejohn <gj@denx.de>
  *
  * Configuation settings for the TRAB board.
 #define __CONFIG_H
 
 /*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
+ * Default configuration is with 8 MB Flash, 32 MB RAM
  */
-#define CONFIG_INIT_CRITICAL           /* undef for developing */
+#if (!defined(CONFIG_FLASH_8MB)) && (!defined(CONFIG_FLASH_16MB))
+# define CONFIG_FLASH_8MB      /*  8 MB Flash  */
+#endif
+#if (!defined(CONFIG_RAM_16MB)) && (!defined(CONFIG_RAM_32MB))
+# define CONFIG_RAM_32MB       /* 32 MB SDRAM  */
+#endif
 
 /*
  * High Level Configuration Options
 #define CONFIG_SETUP_MEMORY_TAGS 1
 #define CONFIG_INITRD_TAG       1
 
+#define CFG_DEVICE_NULLDEV      1      /* enble null device            */
+#define CONFIG_SILENT_CONSOLE   1      /* enable silent startup        */
+
+#define CONFIG_VERSION_VARIABLE        1       /* include version env variable */
 
 /***********************************************************
  * I2C stuff:
@@ -80,6 +88,7 @@
  * Size of malloc() pool
  */
 #define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128*1024)
+#define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
  * Hardware drivers
 #endif
 
 #ifndef USE_920T_MMU
-#define CONFIG_COMMANDS                ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \
-                                CFG_CMD_BSP                    | \
-                                CFG_CMD_DATE                   | \
-                                CONFIG_COMMANDS_ADD_HWFLOW     | \
-                                CONFIG_COMMANDS_ADD_VFD        | \
-                                CONFIG_COMMANDS_ADD_EEPROM     | \
-                                CFG_CMD_USB                    | \
-                                CFG_CMD_FAT                    | \
-                                CONFIG_COMMANDS_I2C            )
+#define CONFIG_COMMANDS               ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \
+                               CONFIG_COMMANDS_ADD_HWFLOW      | \
+                               CONFIG_COMMANDS_ADD_VFD         | \
+                               CONFIG_COMMANDS_ADD_EEPROM      | \
+                               CONFIG_COMMANDS_I2C             | \
+                               CFG_CMD_BSP                     | \
+                               CFG_CMD_DATE                    | \
+                               CFG_CMD_DHCP                    | \
+                               CFG_CMD_FAT                     | \
+                               CFG_CMD_JFFS2                   | \
+                               CFG_CMD_NFS                     | \
+                               CFG_CMD_SNTP                    | \
+                               CFG_CMD_USB     )
 #else
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL                 | \
-                                CFG_CMD_BSP                    | \
-                                CFG_CMD_DATE                   | \
-                                CONFIG_COMMANDS_ADD_HWFLOW     | \
-                                CONFIG_COMMANDS_ADD_VFD        | \
-                                CONFIG_COMMANDS_ADD_EEPROM     | \
-                                CFG_CMD_USB                    | \
-                                CFG_CMD_FAT                    | \
-                                CONFIG_COMMANDS_I2C            )
+#define CONFIG_COMMANDS               (CONFIG_CMD_DFL                  | \
+                               CONFIG_COMMANDS_ADD_HWFLOW      | \
+                               CONFIG_COMMANDS_ADD_VFD         | \
+                               CONFIG_COMMANDS_ADD_EEPROM      | \
+                               CONFIG_COMMANDS_I2C             | \
+                               CFG_CMD_BSP                     | \
+                               CFG_CMD_DATE                    | \
+                               CFG_CMD_DHCP                    | \
+                               CFG_CMD_FAT                     | \
+                               CFG_CMD_JFFS2                   | \
+                               CFG_CMD_NFS                     | \
+                               CFG_CMD_SNTP                    | \
+                               CFG_CMD_USB     )
 #endif
 
 /* moved up */
 #define CONFIG_IPADDR          192.168.3.68
 #define CONFIG_HOSTNAME                trab
 #define CONFIG_SERVERIP                192.168.3.1
-#define CONFIG_BOOTCOMMAND     "run flash_nfs"
+#define CONFIG_BOOTCOMMAND     "burn_in"
 
-#ifndef CONFIG_OLD_VERSION     /* current config: 16 MB flash, 32 MB RAM */
+#ifndef CONFIG_FLASH_8MB       /* current config: 16 MB flash */
 #ifdef CFG_HUSH_PARSER
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
        "nfs_args=setenv bootargs root=/dev/nfs rw " \
        "loadaddr=c400000\0" \
        "net_load=tftpboot $loadaddr $loadfile\0" \
        "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \
-       "kernel_addr=000C0000\0" \
+       "kernel_addr=00060000\0" \
        "flash_nfs=run nfs_args add_net add_misc;bootm $kernel_addr\0" \
        "mdm_init1=ATZ\0" \
        "mdm_init2=ATS0=1\0" \
 #else /* !CFG_HUSH_PARSER */
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
        "nfs_args=setenv bootargs root=/dev/nfs rw " \
-               "nfsroot=$(serverip):$(rootpath)\0" \
+               "nfsroot=${serverip}:${rootpath}\0" \
        "rootpath=/opt/eldk/arm_920TDI\0" \
        "ram_args=setenv bootargs root=/dev/ram rw\0" \
-       "add_net=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0" \
-       "add_misc=setenv bootargs $(bootargs) console=ttyS0 panic=1\0" \
+       "add_net=setenv bootargs ${bootargs} ethaddr=${ethaddr} " \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \
+       "add_misc=setenv bootargs ${bootargs} console=ttyS0 panic=1\0" \
        "u-boot=/tftpboot/TRAB/u-boot.bin\0" \
-       "load=tftp C100000 $(u-boot)\0" \
+       "load=tftp C100000 ${u-boot}\0" \
        "update=protect off 0 5FFFF;era 0 5FFFF;" \
-               "cp.b C100000 0 $(filesize)\0" \
+               "cp.b C100000 0 ${filesize}\0" \
        "loadfile=/tftpboot/TRAB/uImage\0" \
        "loadaddr=c400000\0" \
-       "net_load=tftpboot $(loadaddr) $(loadfile)\0" \
+       "net_load=tftpboot ${loadaddr} ${loadfile}\0" \
        "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \
        "kernel_addr=000C0000\0" \
-       "flash_nfs=run nfs_args add_net add_misc;bootm $(kernel_addr)\0" \
+       "flash_nfs=run nfs_args add_net add_misc;bootm ${kernel_addr}\0" \
        "mdm_init1=ATZ\0" \
        "mdm_init2=ATS0=1\0" \
        "mdm_flow_control=rts/cts\0"
 #endif /* CFG_HUSH_PARSER */
-#else          /* CONFIG_OLD_VERSION  => 8 MB flash, 16 MB RAM */
+#else  /* CONFIG_FLASH_8MB      => 8 MB flash */
 #ifdef CFG_HUSH_PARSER
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
        "nfs_args=setenv bootargs root=/dev/nfs rw " \
        "add_net=setenv bootargs $bootargs ethaddr=$ethaddr " \
                "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \
        "add_misc=setenv bootargs $bootargs console=ttyS0 panic=1\0" \
-       "u-boot=/tftpboot/TRAB/u-boot.bin-old\0" \
+       "u-boot=/tftpboot/TRAB/u-boot.bin\0" \
        "load=tftp C100000 ${u-boot}\0" \
        "update=protect off 0 3FFFF;era 0 3FFFF;" \
                "cp.b C100000 0 $filesize;" \
 #else /* !CFG_HUSH_PARSER */
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
        "nfs_args=setenv bootargs root=/dev/nfs rw " \
-               "nfsroot=$(serverip):$(rootpath)\0" \
+               "nfsroot=${serverip}:${rootpath}\0" \
        "rootpath=/opt/eldk/arm_920TDI\0" \
        "ram_args=setenv bootargs root=/dev/ram rw\0" \
-       "add_net=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0" \
-       "add_misc=setenv bootargs $(bootargs) console=ttyS0 panic=1\0" \
-       "u-boot=/tftpboot/TRAB/u-boot.bin-old\0" \
-       "load=tftp C100000 $(u-boot)\0" \
+       "add_net=setenv bootargs ${bootargs} ethaddr=${ethaddr} " \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \
+       "add_misc=setenv bootargs ${bootargs} console=ttyS0 panic=1\0" \
+       "u-boot=/tftpboot/TRAB/u-boot.bin\0" \
+       "load=tftp C100000 ${u-boot}\0" \
        "update=protect off 0 3FFFF;era 0 3FFFF;" \
-               "cp.b C100000 0 $(filesize);" \
+               "cp.b C100000 0 ${filesize};" \
                "setenv filesize;saveenv\0" \
        "loadfile=/tftpboot/TRAB/uImage\0" \
        "loadaddr=C400000\0" \
-       "net_load=tftpboot $(loadaddr) $(loadfile)\0" \
+       "net_load=tftpboot ${loadaddr} ${loadfile}\0" \
        "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \
        "kernel_addr=000C0000\0" \
-       "flash_nfs=run nfs_args add_net add_misc;bootm $(kernel_addr)\0" \
+       "flash_nfs=run nfs_args add_net add_misc;bootm ${kernel_addr}\0" \
        "mdm_init1=ATZ\0" \
        "mdm_init2=ATS0=1\0" \
        "mdm_flow_control=rts/cts\0"
 #endif /* CFG_HUSH_PARSER */
-#endif /* CONFIG_OLD_VERSION */
+#endif /* CONFIG_FLASH_8MB */
 
-#if 0  /* disabled for development */
+#if 1  /* feel free to disable for development */
 #define        CONFIG_AUTOBOOT_KEYED           /* Enable password protection   */
 #define CONFIG_AUTOBOOT_PROMPT "\nEnter password - autoboot in %d sec...\n"
-#define CONFIG_AUTOBOOT_DELAY_STR      "system"        /* 1st password */
+#define CONFIG_AUTOBOOT_DELAY_STR      "R"     /* 1st "password"       */
 #endif
 
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CONFIG_MISC_INIT_R             /* have misc_init_r() function  */
 
 /*-----------------------------------------------------------------------
- * burn-in test stuff
+ * burn-in test stuff.
+ *
+ * BURN_IN_CYCLE_DELAY defines the seconds to wait between each burn-in cycle
+ * Because the burn-in test itself causes also an delay of about 4 seconds,
+ * this time must be subtracted from the desired overall burn-in cycle time.
  */
-#define BURN_IN_CYCLE_DELAY    20      /* delay in sec between burn-in test cycles */
+#define BURN_IN_CYCLE_DELAY    296     /* seconds between burn-in cycles */
 
 /*-----------------------------------------------------------------------
  * Stack sizes
  */
 #define CONFIG_NR_DRAM_BANKS   1               /* we have 1 bank of DRAM */
 #define PHYS_SDRAM_1           0x0C000000      /* SDRAM Bank #1 */
-#ifndef CONFIG_OLD_VERSION
+#ifndef CONFIG_RAM_16MB
 #define PHYS_SDRAM_1_SIZE      0x02000000      /* 32 MB */
 #else
 #define PHYS_SDRAM_1_SIZE      0x01000000      /* 16 MB */
 #define        CFG_MONITOR_BASE        CFG_FLASH_BASE
 #define        CFG_MONITOR_LEN         (256 << 10)
 
+/* Dynamic MTD partition support */
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         "nor0=0"
+
+/* production flash layout */
+#define MTDPARTS_DEFAULT       "mtdparts=0:32k(Firmware1)ro,"          \
+                                               "16k(Env1),"            \
+                                               "16k(Env2),"            \
+                                               "320k(Firmware2)ro,"    \
+                                               "896k(Kernel),"         \
+                                               "5376k(Root-FS),"       \
+                                               "1408k(JFFS2),"         \
+                                               "-(VFD)"
+
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
-#ifndef CONFIG_OLD_VERSION
+#ifndef CONFIG_FLASH_8MB
 #define CFG_MAX_FLASH_SECT     128     /* max number of sectors on one chip */
 #else
 #define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
 #define        CFG_ENV_IS_IN_FLASH     1
 
 /* Address and size of Primary Environment Sector      */
-#ifndef CONFIG_OLD_VERSION
+#ifndef CONFIG_FLASH_8MB
 #define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x60000)
 #define CFG_ENV_SIZE           0x4000
 #define CFG_ENV_SECT_SIZE      0x20000