From 9314cee6917444ab88bd4e758da7a30975120187 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 22:47:59 +0200 Subject: rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- include/configs/ADCIOP.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/ADCIOP.h') diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index 5d28168..148c905 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -160,7 +160,7 @@ /*----------------------------------------------------------------------- * NVRAM organization */ -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #define CFG_NVRAM_BASE_ADDR 0x10000000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ #define CFG_ENV_SIZE 0x0400 /* Size of Environment vars */ -- cgit v1.1 From 5a1aceb0689e2f731491838970884a673ef7e7d3 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 22:48:04 +0200 Subject: rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- include/configs/ADCIOP.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/ADCIOP.h') diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index 148c905..0069aab 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -170,7 +170,7 @@ #else /* Use FLASH for environment variables */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 #define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ #define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -- cgit v1.1 From 0e8d158664a913392cb01fb11a948d83f72e105e Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 22:48:06 +0200 Subject: rename CFG_ENV macros to CONFIG_ENV Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- include/configs/ADCIOP.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/configs/ADCIOP.h') diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index 0069aab..cc7eddc 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -163,18 +163,18 @@ #define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */ #define CFG_NVRAM_BASE_ADDR 0x10000000 /* NVRAM base address */ #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */ -#define CFG_ENV_SIZE 0x0400 /* Size of Environment vars */ -#define CFG_ENV_ADDR \ - (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */ +#define CONFIG_ENV_SIZE 0x0400 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #define CFG_VXWORKS_MAC_PTR (CFG_NVRAM_BASE_ADDR+0x7800) /* VxWorks eth-addr*/ #else /* Use FLASH for environment variables */ #define CONFIG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x8000 /* see README - env sector total size */ +#define CONFIG_ENV_SECT_SIZE 0x8000 /* see README - env sector total size */ #endif -- cgit v1.1