diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-04-05 01:48:33 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-10 11:54:08 -0400 |
| commit | a7b00a7bf6d92648827d94f4f1dcdb0b5336fe0e (patch) | |
| tree | b2c5bf7eacd5ed1f6b84b7c43598e257fd9bccc6 /include/configs/integratorap.h | |
| parent | 10d1491b3dea43182aec5cdce8f81ca520400c4b (diff) | |
integrator: consolidate flash info
This consolidates the flash settings for the Integrator
and activates the new ARM flash image support for them
so images can be loaded by name from flash.
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/configs/integratorap.h')
| -rw-r--r-- | include/configs/integratorap.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index edea769a92..e168c8c9ba 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -55,22 +55,12 @@ */ #define CONFIG_SYS_PROMPT "Integrator-AP # " /* Monitor Command Prompt */ -#define CONFIG_SYS_FLASH_BASE 0x24000000 - -/*----------------------------------------------------------------------- - * FLASH and environment organization - */ -#define CONFIG_SYS_FLASH_CFI 1 -#define CONFIG_FLASH_CFI_DRIVER 1 -#define CONFIG_ENV_IS_NOWHERE -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ -/* timeout values are in ticks */ -#define CONFIG_SYS_FLASH_ERASE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Erase */ -#define CONFIG_SYS_FLASH_WRITE_TOUT (2*CONFIG_SYS_HZ) /* Timeout for Flash Write */ +/* Flash settings */ +#define CONFIG_SYS_FLASH_SIZE 0x02000000 /* 32 MiB */ #define CONFIG_SYS_MAX_FLASH_SECT 128 +#define CONFIG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_SIZE 32768 - /*----------------------------------------------------------------------- * PCI definitions */ |