GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-06 14:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH

Browse source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-09-10 22:48:00 +02:00
parent 55c5f49910
commit 0b5099a841
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/cmd_nvedit.c
View file

@ -58,7 +58,7 @@ DECLARE_GLOBAL_DATA_PTR;
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \ !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
!defined(CONFIG_ENV_IS_IN_NAND) && \ !defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CONFIG_ENV_IS_IN_ONENAND) && \ !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) !defined(CFG_ENV_IS_NOWHERE)
# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE} # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
#endif #endif

2
common/env_common.c
View file

@ -134,7 +134,7 @@ uchar default_environment[] = {
}; };
#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \ #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); int default_environment_size = sizeof(default_environment);
#endif #endif

4
common/env_sf.c
View file

@ -27,7 +27,7 @@
*/ */
#include <common.h> #include <common.h>
#ifdef CFG_ENV_IS_IN_SPI_FLASH #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
#include <environment.h> #include <environment.h>
#include <spi_flash.h> #include <spi_flash.h>
@ -136,4 +136,4 @@ int env_init(void)
return 0; return 0;
} }
#endif /* CFG_ENV_IS_IN_SPI_FLASH */ #endif /* CONFIG_ENV_IS_IN_SPI_FLASH */

2
include/configs/M54451EVB.h
View file

@ -266,7 +266,7 @@
* Environment is embedded in u-boot in the second sector of the flash * Environment is embedded in u-boot in the second sector of the flash
*/ */
#if defined(CONFIG_CF_SBF) #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_SPI_CS 1
# define CFG_ENV_OFFSET 0x20000 # define CFG_ENV_OFFSET 0x20000
# define CFG_ENV_SIZE 0x2000 # define CFG_ENV_SIZE 0x2000

2
include/configs/M54455EVB.h
View file

@ -331,7 +331,7 @@
* Environment is embedded in u-boot in the second sector of the flash * Environment is embedded in u-boot in the second sector of the flash
*/ */
#ifdef CONFIG_CF_SBF #ifdef CONFIG_CF_SBF
# define CFG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_IS_IN_SPI_FLASH
# define CFG_ENV_SPI_CS 1 # define CFG_ENV_SPI_CS 1
#else #else
# define CFG_ENV_IS_IN_FLASH 1 # define CFG_ENV_IS_IN_FLASH 1