rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
parent
55c5f49910
commit
0b5099a841
@ -58,7 +58,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
|
||||
!defined(CONFIG_ENV_IS_IN_NAND) && \
|
||||
!defined(CONFIG_ENV_IS_IN_ONENAND) && \
|
||||
!defined(CFG_ENV_IS_IN_SPI_FLASH) && \
|
||||
!defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \
|
||||
!defined(CFG_ENV_IS_NOWHERE)
|
||||
# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
|
||||
#endif
|
||||
|
@ -134,7 +134,7 @@ uchar default_environment[] = {
|
||||
};
|
||||
|
||||
#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
|
||||
|| defined(CFG_ENV_IS_IN_SPI_FLASH)
|
||||
|| defined(CONFIG_ENV_IS_IN_SPI_FLASH)
|
||||
int default_environment_size = sizeof(default_environment);
|
||||
#endif
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
*/
|
||||
#include <common.h>
|
||||
|
||||
#ifdef CFG_ENV_IS_IN_SPI_FLASH
|
||||
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
|
||||
#include <environment.h>
|
||||
#include <spi_flash.h>
|
||||
@ -136,4 +136,4 @@ int env_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CFG_ENV_IS_IN_SPI_FLASH */
|
||||
#endif /* CONFIG_ENV_IS_IN_SPI_FLASH */
|
||||
|
@ -266,7 +266,7 @@
|
||||
* Environment is embedded in u-boot in the second sector of the flash
|
||||
*/
|
||||
#if defined(CONFIG_CF_SBF)
|
||||
# define CFG_ENV_IS_IN_SPI_FLASH 1
|
||||
# define CONFIG_ENV_IS_IN_SPI_FLASH 1
|
||||
# define CFG_ENV_SPI_CS 1
|
||||
# define CFG_ENV_OFFSET 0x20000
|
||||
# define CFG_ENV_SIZE 0x2000
|
||||
|
@ -331,7 +331,7 @@
|
||||
* Environment is embedded in u-boot in the second sector of the flash
|
||||
*/
|
||||
#ifdef CONFIG_CF_SBF
|
||||
# define CFG_ENV_IS_IN_SPI_FLASH
|
||||
# define CONFIG_ENV_IS_IN_SPI_FLASH
|
||||
# define CFG_ENV_SPI_CS 1
|
||||
#else
|
||||
# define CFG_ENV_IS_IN_FLASH 1
|
||||
|
Loading…
Reference in New Issue
Block a user