diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-06-10 00:03:57 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-06-17 16:39:09 +0200 |
| commit | 3aa890525b1211857a750e82b38124f798a5cf75 (patch) | |
| tree | 658a83347ff336825d5356d2adf2a3af994aeda2 /include/configs | |
| parent | a7650486a58271d331e5a551b0e7c40ce0112a8f (diff) | |
| download | u-boot-imx-3aa890525b1211857a750e82b38124f798a5cf75.zip u-boot-imx-3aa890525b1211857a750e82b38124f798a5cf75.tar.gz u-boot-imx-3aa890525b1211857a750e82b38124f798a5cf75.tar.bz2 | |
mx28evk: Fix warning when CONFIG_ENV_IS_IN_SPI_FLASH is selected
When building a target with CONFIG_ENV_IS_IN_SPI_FLASH the following
warning is seen:
include/configs/mx28evk.h:73:0: warning: "CONFIG_ENV_SIZE" redefined [enabled by default]
Protect the definition of CONFIG_ENV_SIZE to avoid the warning.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx28evk.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 9b9124a..9daa0bf 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -48,7 +48,11 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Environment */ +#ifndef CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE (16 * 1024) +#else +#define CONFIG_ENV_SIZE (4 * 1024) +#endif #define CONFIG_ENV_OVERWRITE /* Environment is in MMC */ @@ -70,7 +74,6 @@ /* Environemnt is in SPI flash */ #if defined(CONFIG_CMD_SF) && defined(CONFIG_ENV_IS_IN_SPI_FLASH) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_SIZE 0x1000 /* 4KB */ #define CONFIG_ENV_OFFSET 0x40000 /* 256K */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_ENV_SECT_SIZE 0x1000 |