Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[u-boot] / board / a3000 / flash.c

diff --git a/board/a3000/flash.c b/board/a3000/flash.c
index cbfd1d1a6d0f35ee713db61ed5c6538d9601cbb9..add2a28866604e995bf6aa387f58d31253f83565 100644 (file)
--- a/board/a3000/flash.c
+++ b/board/a3000/flash.c
@@ -25,15 +25,15 @@
 #include <common.h>
 #include <mpc824x.h>
 
-#if defined(CFG_ENV_IS_IN_FLASH)
-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR  (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR  (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
 # endif
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE  CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE  CONFIG_ENV_SECT_SIZE
 # endif
-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE
 # endif
 #endif
 
@@ -71,7 +71,7 @@ unsigned long flash_init (void)
        int i;
 
        /* Init: no FLASHes known */
-       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) 
+       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i)
        {
                flash_info[i].flash_id = FLASH_UNKNOWN;
 
@@ -81,7 +81,7 @@ unsigned long flash_init (void)
 */
                size_b[i] = flash_get_size((vu_char *) 0xff800000 , &flash_info[i]);
 
-               if (flash_info[i].flash_id == FLASH_UNKNOWN) 
+               if (flash_info[i].flash_id == FLASH_UNKNOWN)
                {
                        printf ("## Unknown FLASH on Bank %d: "
                                "ID 0x%lx, Size = 0x%08lx = %ld MB\n",
@@ -108,18 +108,18 @@ unsigned long flash_init (void)
                      &flash_info[0]);
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
-       DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE);
+       DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE);
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
                      &flash_info[0]);
 #endif
 
        size = 0;
        DEBUGF("## Final Flash bank sizes: ");
-       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) 
+       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i)
        {
                DEBUGF("%08lx ", size_b[i]);
                size += size_b[i];
@@ -174,16 +174,16 @@ void flash_print_info  (flash_info_t *info)
        }
 
        switch (info->flash_id & FLASH_TYPEMASK) {
-       case FLASH_28F320J3A:   
+       case FLASH_28F320J3A:
                        printf ("28F320J3A (32Mbit = 128K x 32)\n");
                        break;
-       case FLASH_28F640J3A:   
+       case FLASH_28F640J3A:
                        printf ("28F640J3A (64Mbit = 128K x 64)\n");
                        break;
-       case FLASH_28F128J3A:   
+       case FLASH_28F128J3A:
                        printf ("28F128J3A (128Mbit = 128K x 128)\n");
                        break;
-       default:                
+       default:
                        printf ("Unknown Chip Type\n");
                        break;
        }