From: Fabio Estevam Date: Tue, 10 Jun 2014 03:03:57 +0000 (-0300) Subject: mx28evk: Fix warning when CONFIG_ENV_IS_IN_SPI_FLASH is selected X-Git-Tag: v2014.07~10^2~13 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3aa890525b1211857a750e82b38124f798a5cf75;p=u-boot 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 --- diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 9b9124ac14..9daa0bf540 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