Merge branch 'master' of /home/wd/git/u-boot/custodians

[oweals/u-boot.git] / board / ep8260 / flash.c

diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c
index 278d606b321c79b07c4e24b0afbbbe66d3a18c9c..d32486d3453a433919731426bb1b6ccbcd18f579 100644 (file)
--- a/board/ep8260/flash.c
+++ b/board/ep8260/flash.c
@@ -72,7 +72,7 @@ ulong flash_get_size( ulong baseaddr, flash_info_t *info )
                info->flash_id = FLASH_UNKNOWN;
                info->sector_count = 0;
                info->size = 0;
-               return (0);                             /* no or unknown flash     */
+               return (0);                             /* no or unknown flash     */
        }
 
        flashtest_h = V_ULONG(baseaddr + 8);            /* device ID               */
@@ -91,11 +91,11 @@ ulong flash_get_size( ulong baseaddr, flash_info_t *info )
        case AMD_ID_LV640U:     /* AMDLV640 and AMDLV641 have same ID */
                info->flash_id += FLASH_AMLV640U;
                info->sector_count = 128;
-               info->size = 0x02000000;        /* 4 * 8 MB = 32 MB     */
+               info->size = 0x02000000;        /* 4 * 8 MB = 32 MB     */
                break;
        default:
                info->flash_id = FLASH_UNKNOWN;
-               return(0);                              /* no or unknown flash     */
+               return(0);                              /* no or unknown flash     */
        }
 
        if(flashtest_h == AMD_ID_LV640U) {
@@ -157,13 +157,13 @@ unsigned long flash_init (void)
                      &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && 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]);
 #endif