* Patch by Robert Schwebel, 21 Jan 2003:

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

diff --git a/include/configs/trab.h b/include/configs/trab.h
index 4472087e10a5e8f7c99d1e34cc59070e8fc909c2..06aed93e68982325756e042a8660509c280c8a85 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -42,7 +42,7 @@
 #undef CONFIG_TRAB_50MHZ               /* run the CPU at 50 MHz */
 
 /* input clock of PLL */
-#define CONFIG_PLL_INPUT_FREQ  12000000 /* TRAB has 12 MHz input clock */
+#define CONFIG_SYS_CLK_FREQ    12000000 /* TRAB has 12 MHz input clock */
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff */
 
@@ -121,9 +121,9 @@
 #define CONFIG_BOOTDELAY       5
 #define CONFIG_PREBOOT         "echo;echo *** booting ***;echo"
 #define CONFIG_BOOTARGS        "console=ttyS0"
-#define CONFIG_ETHADDR         00:D0:93:00:61:11
-#define CONFIG_NETMASK          255.255.255.0
-#define CONFIG_IPADDR          192.168.3.27
+#define CONFIG_NETMASK          255.255.0.0
+#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_EXTRA_ENV_SETTINGS       \
@@ -135,7 +135,7 @@
                "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0" \
        "add_misc=setenv bootargs $(bootargs) console=ttyS0 panic=1\0" \
        "load=tftp 0xC100000 /tftpboot/TRAB/u-boot.bin\0" \
-       "update=protect off 1:0-7;era 1:0-7;cp.b 0xc100000 0 $(filesize);" \
+       "update=protect off 1:0-8;era 1:0-8;cp.b 0xc100000 0 $(filesize);" \
                "setenv filesize;saveenv\0" \
        "loadfile=/tftpboot/TRAB/pImage\0" \
        "loadaddr=c400000\0" \
@@ -211,20 +211,21 @@
 #define PHYS_SDRAM_1           0x0c000000 /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE      0x01000000 /* 16 MB */
 
-#define PHYS_FLASH_1           0x00000000 /* Flash Bank #1 */
-#define PHYS_FLASH_SIZE                0x00800000 /* 8 MB */
+#define CFG_FLASH_BASE         0x00000000 /* Flash Bank #1 */
 
 /* The following #defines are needed to get flash environment right */
-#define        CFG_MONITOR_BASE        PHYS_FLASH_1
+#define        CFG_MONITOR_BASE        CFG_FLASH_BASE
 #define        CFG_MONITOR_LEN         (256 << 10)
 
-#define CFG_FLASH_BASE         PHYS_FLASH_1
-
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
 #define CFG_MAX_FLASH_BANKS    1       /* max number of memory banks */
-#define CFG_MAX_FLASH_SECT     (71)    /* max number of sectors on one chip */
+#ifndef CONFIG_BIG_FLASH
+#define CFG_MAX_FLASH_SECT     71      /* max number of sectors on one chip */
+#else
+#define CFG_MAX_FLASH_SECT     128     /* max number of sectors on one chip */
+#endif
 
 /* timeout values are in ticks */
 #define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ) /* Timeout for Flash Erase */
@@ -233,11 +234,18 @@
 #define        CFG_ENV_IS_IN_FLASH     1
 
 /* Address and size of Primary Environment Sector      */
-#define CFG_ENV_ADDR           (PHYS_FLASH_1 + 0x4000)
+#ifndef CONFIG_BIG_FLASH
+#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x4000)
 #define CFG_ENV_SIZE           0x4000
+#define CFG_ENV_SECT_SIZE      0x4000
+#else
+#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x40000)
+#define CFG_ENV_SIZE           0x4000
+#define CFG_ENV_SECT_SIZE      0x20000
+#endif
 
 /* Address and size of Redundant Environment Sector    */
-#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_ADDR+CFG_ENV_SIZE)
+#define CFG_ENV_OFFSET_REDUND  (CFG_ENV_ADDR+CFG_ENV_SECT_SIZE)
 #define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
 
 #endif /* __CONFIG_H */