diff options
| author | Matt Waddel <matt.waddel@linaro.org> | 2010-09-14 18:17:20 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-14 18:22:26 -0600 |
| commit | a225a6747917d2074b9d8a387a2153f2146d75f4 (patch) | |
| tree | b659b13158a1b6249432d0bad3e220a7c0259cca | |
| parent | 071412cf8d437e0155f41a2b82c938921ee7ccbe (diff) | |
LINARO: vexpress: Add support for 2nd 64M bank of flash2010.09.rc1.1
BugLink: http://bugs.launchpad.net/bugs/637780
Signed-off-by: Matt Waddel <matt.waddel@linaro.org>
| -rw-r--r-- | include/configs/CCM.h | 1 | ||||
| -rw-r--r-- | include/configs/ca9x4_ct_vxp.h | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/configs/CCM.h b/include/configs/CCM.h index 3f4a2c103..5bdf4a568 100644 --- a/include/configs/CCM.h +++ b/include/configs/CCM.h @@ -199,7 +199,6 @@ #else #define CONFIG_SYS_MONITOR_LEN (192 << 10) /* Reserve 192 kB for Monitor */ #endif -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ /* diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index a071b9b8f..2dd0b8c8c 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -125,6 +125,9 @@ #define CONFIG_SYS_FLASH_SIZE 0x04000000 #define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_SYS_FLASH_BASE 0x40000000 +#define CONFIG_SYS_FLASH_BASE0 0x40000000 +#define CONFIG_SYS_FLASH_BASE1 0x44000000 +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE0 /* Timeout values in ticks */ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */ @@ -136,7 +139,7 @@ #define FLASH_MIN_SECTOR_SIZE 0x00010000 /* 64 KB sectors */ /* Room required on the stack for the environment data */ -#define CONFIG_ENV_SIZE 8192 +#define CONFIG_ENV_SIZE FLASH_MAX_SECTOR_SIZE /* * Amount of flash used for environment: @@ -152,11 +155,12 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_OFFSET (PHYS_FLASH_SIZE - \ (2 * CONFIG_ENV_SECT_SIZE)) -#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + \ +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE1 + \ CONFIG_ENV_OFFSET) #define CONFIG_SYS_FLASH_PROTECTION /* The devices have real protection */ #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ -#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } +#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE0, \ + CONFIG_SYS_FLASH_BASE1 } /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ |