From 7d9b5bae5ba558c7464d89d033aca04acaf01172 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 22:48:03 +0200 Subject: cleanup use of CFG_ENV_IS_IN_FLASH - #if CFG_ENV_IS_IN_FLASH - #if (CFG_ENV_IS_IN_FLASH == 1) - #define CFG_ENV_IS_IN_FLASH 0 Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- board/rsdproto/flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/rsdproto/flash.c') diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c index 4e43b29..d9f6b3b 100644 --- a/board/rsdproto/flash.c +++ b/board/rsdproto/flash.c @@ -131,7 +131,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) +#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif -- 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 --- board/rsdproto/flash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/rsdproto/flash.c') diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c index d9f6b3b..f954458 100644 --- a/board/rsdproto/flash.c +++ b/board/rsdproto/flash.c @@ -131,7 +131,7 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif -- 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 --- board/rsdproto/flash.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'board/rsdproto/flash.c') diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c index f954458..312b400 100644 --- a/board/rsdproto/flash.c +++ b/board/rsdproto/flash.c @@ -131,17 +131,17 @@ unsigned long flash_init (void) &flash_info[1]); #endif -#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) -# ifndef CFG_ENV_SIZE -# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE +#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR) +# ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE # endif flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE - 1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, - CFG_ENV_ADDR, - CFG_ENV_ADDR + CFG_ENV_SIZE - 1, + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]); #endif -- cgit v1.1 From 6d0f6bcf337c5261c08fabe12982178c2c489d76 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 16 Oct 2008 15:01:15 +0200 Subject: rename CFG_ macros to CONFIG_SYS Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- board/rsdproto/flash.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'board/rsdproto/flash.c') diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c index 312b400..e99c2a6 100644 --- a/board/rsdproto/flash.c +++ b/board/rsdproto/flash.c @@ -41,7 +41,7 @@ */ #undef WITH_AUTOSELECT -flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ +flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ #if 1 #define D(x) @@ -94,7 +94,7 @@ unsigned long flash_init (void) #endif /* Init: no FLASHes known */ - for (i=0; i= PHYS_FLASH +#if CONFIG_SYS_MONITOR_BASE >= PHYS_FLASH flash_protect(FLAG_PROTECT_SET, - CFG_MONITOR_BASE, - CFG_MONITOR_BASE+monitor_flash_len-1, + CONFIG_SYS_MONITOR_BASE, + CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1, &flash_info[0]); flash_protect(FLAG_PROTECT_SET, - CFG_MONITOR_BASE, - CFG_MONITOR_BASE+monitor_flash_len-1, + CONFIG_SYS_MONITOR_BASE, + CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1, &flash_info[1]); #endif @@ -259,7 +259,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) start = get_timer (0); do { - if (get_timer(start) > CFG_FLASH_ERASE_TOUT) + if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) { /* write reset command, command address is unimportant */ /* this command turns the flash back to read mode */ f_addr = @@ -387,7 +387,7 @@ static unsigned char write_ull(flash_info_t *info, start = get_timer (0); do { - if (get_timer(start) > CFG_FLASH_WRITE_TOUT) + if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { /* write reset command, command address is unimportant */ /* this command turns the flash back to read mode */ -- cgit v1.1