diff options
Diffstat (limited to 'include/configs/trab.h')
| -rw-r--r-- | include/configs/trab.h | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/include/configs/trab.h b/include/configs/trab.h index 06aed93e68..61a643adc9 100644 --- a/include/configs/trab.h +++ b/include/configs/trab.h @@ -117,7 +117,6 @@ /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ #include <cmd_confdefs.h> - #define CONFIG_BOOTDELAY 5 #define CONFIG_PREBOOT "echo;echo *** booting ***;echo" #define CONFIG_BOOTARGS "console=ttyS0" @@ -126,6 +125,8 @@ #define CONFIG_HOSTNAME trab #define CONFIG_SERVERIP 192.168.3.1 #define CONFIG_BOOTCOMMAND "run flash_nfs" + +#ifndef CONFIG_BIG_FLASH #define CONFIG_EXTRA_ENV_SETTINGS \ "nfs_args=setenv bootargs root=/dev/nfs rw " \ "nfsroot=$(serverip):$(rootpath)\0" \ @@ -137,7 +138,7 @@ "load=tftp 0xC100000 /tftpboot/TRAB/u-boot.bin\0" \ "update=protect off 1:0-8;era 1:0-8;cp.b 0xc100000 0 $(filesize);" \ "setenv filesize;saveenv\0" \ - "loadfile=/tftpboot/TRAB/pImage\0" \ + "loadfile=/tftpboot/TRAB/uImage\0" \ "loadaddr=c400000\0" \ "net_load=tftpboot $(loadaddr) $(loadfile)\0" \ "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \ @@ -146,6 +147,27 @@ "mdm_init1=ATZ\0" \ "mdm_init2=ATS0=1\0" \ "mdm_flow_control=rts/cts\0" +#else /* CONFIG_BIG_FLASH */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "nfs_args=setenv bootargs root=/dev/nfs rw " \ + "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" \ + "load=tftp 0xC100000 /tftpboot/TRAB/u-boot.bin\0" \ + "update=protect off 1:0;era 1:0;cp.b 0xc100000 0 $(filesize)\0" \ + "loadfile=/tftpboot/TRAB/uImage\0" \ + "loadaddr=c400000\0" \ + "net_load=tftpboot $(loadaddr) $(loadfile)\0" \ + "net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \ + "kernel_addr=00040000\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 /* CONFIG_BIG_FLASH */ #if 0 /* disabled for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ @@ -215,7 +237,11 @@ /* The following #defines are needed to get flash environment right */ #define CFG_MONITOR_BASE CFG_FLASH_BASE +#ifndef CONFIG_BIG_FLASH #define CFG_MONITOR_LEN (256 << 10) +#else +#define CFG_MONITOR_LEN (128 << 10) +#endif /*----------------------------------------------------------------------- * FLASH and environment organization @@ -239,7 +265,7 @@ #define CFG_ENV_SIZE 0x4000 #define CFG_ENV_SECT_SIZE 0x4000 #else -#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000) +#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) #define CFG_ENV_SIZE 0x4000 #define CFG_ENV_SECT_SIZE 0x20000 #endif |
