rename CFG_ENV macros to CONFIG_ENV

[people/ms/u-boot.git] / board / cpu86 / flash.c

diff --git a/board/cpu86/flash.c b/board/cpu86/flash.c
index 8cf761f1e65512ee3a2cf053a792e51d3ab71ce0..845a3b2af9af4a3adae7adf7f5f86160b928b23f 100644 (file)
--- a/board/cpu86/flash.c
+++ b/board/cpu86/flash.c
@@ -41,10 +41,10 @@ ulong flash_int_get_size (volatile unsigned long *baseaddr,
        info->sector_count = info->size = 0;
        info->flash_id = FLASH_UNKNOWN;
 
-       /* Write query command sequence and test FLASH answer
+       /* Write identify command sequence and test FLASH answer
         */
-       baseaddr[0] = 0x00980098;
-       baseaddr[1] = 0x00980098;
+       baseaddr[0] = 0x00900090;
+       baseaddr[1] = 0x00900090;
 
        flashtest_h = baseaddr[0];      /* manufacturer ID      */
        flashtest_l = baseaddr[1];
@@ -218,32 +218,32 @@ unsigned long flash_init (void)
 
                flash_protect  (FLAG_PROTECT_SET,
                                CFG_MONITOR_BASE,
-                               CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[1]
+                               CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[1]
                );
        }
 #else
 #if CFG_MONITOR_BASE >= CFG_FLASH_BASE
        flash_protect (FLAG_PROTECT_SET,
                       CFG_MONITOR_BASE,
-                      CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, &flash_info[0]
+                      CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]
        );
 #endif
 #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
-# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE
+# if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE
        if (size_b1) {
                flash_protect (FLAG_PROTECT_SET,
-                               CFG_ENV_ADDR,
-                               CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]);
+                               CONFIG_ENV_ADDR,
+                               CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
        }
 # else
        flash_protect (FLAG_PROTECT_SET,
-                      CFG_ENV_ADDR,
-                      CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
 # endif
 #endif