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

[platform/kernel/u-boot.git] / board / esd / pf5200 / flash.c

diff --git a/board/esd/pf5200/flash.c b/board/esd/pf5200/flash.c
index bfbd090..8178b56 100644 (file)
--- a/board/esd/pf5200/flash.c
+++ b/board/esd/pf5200/flash.c
@@ -76,11 +76,11 @@ unsigned long flash_init(void)
                      flash_get_info(CFG_MONITOR_BASE));
 #endif
 
-#ifdef  CFG_ENV_IS_IN_FLASH
+#ifdef  CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
-       flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
-                     flash_get_info(CFG_ENV_ADDR));
+       flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
+                     flash_get_info(CONFIG_ENV_ADDR));
 #endif
 
        flash_afterinit(i, flash_info[i].start[0], flash_info[i].size);
@@ -122,7 +122,7 @@ static flash_info_t *flash_get_info(ulong base) {
 
 void flash_print_info(flash_info_t * info) {
        int i;
-       uchar *fmt;
+       char *fmt;
 
        if (info->flash_id == FLASH_UNKNOWN) {
                printf("missing or unknown FLASH type\n");