summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-05-14 23:18:33 +0200
committerWolfgang Denk <wd@denx.de>2009-06-12 20:39:52 +0200
commit929b79a0b5e48303ab04aae9d0abceb0c707f111 (patch)
tree94e392b301a5afb0f50364639b8726c251a34574
parent2ae0f35fd60c7345446835b95a4daff356e1f031 (diff)
downloadu-boot-imx-929b79a0b5e48303ab04aae9d0abceb0c707f111.zip
u-boot-imx-929b79a0b5e48303ab04aae9d0abceb0c707f111.tar.gz
u-boot-imx-929b79a0b5e48303ab04aae9d0abceb0c707f111.tar.bz2
TQM834x: fix environment size; add redundant env.
Also reserve more space for U-Boot as it will probably grow soon. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
-rw-r--r--include/configs/TQM834x.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 5510730..7d72fa1 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -159,8 +159,8 @@ extern int tqm834x_num_flash_banks;
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
-#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
-#define CONFIG_SYS_MALLOC_LEN (256 * 1024) /* Reserve 256 kB for malloc */
+#define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB = 3 sect. for Mon */
+#define CONFIG_SYS_MALLOC_LEN (512 * 1024) /* Reserve 512 kB for malloc */
/*
* Serial Port
@@ -275,22 +275,20 @@ extern int tqm834x_num_flash_banks;
/*
* Environment
*/
-#define CONFIG_ENV_OVERWRITE
-
-#ifndef CONFIG_SYS_RAMBOOT
- #define CONFIG_ENV_IS_IN_FLASH 1
- #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + 0x40000)
- #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
- #define CONFIG_ENV_SIZE 0x2000
+#ifdef CONFIG_SYS_RAMBOOT
+# define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
#else
- #define CONFIG_SYS_NO_FLASH 1 /* Flash is not usable now */
- #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)
- #define CONFIG_ENV_SIZE 0x2000
+# define CONFIG_ENV_IS_IN_FLASH 1
#endif
+#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
+#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */
+#define CONFIG_ENV_SIZE 0x8000 /* 32K max size */
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
+
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
+#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
/*
* BOOTP options