rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/board/xsengine/flash.c b/board/xsengine/flash.c
index 3f93700..f29def2 100644 (file)
--- a/board/xsengine/flash.c
+++ b/board/xsengine/flash.c
@@ -46,11 +46,11 @@ unsigned long flash_init (void)
        for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
                switch (i) {
                case 0:
-                       flash_get_size ((long *) PHYS_FLASH_1, &flash_info[i]);
+                       flash_get_size ((vu_long *) PHYS_FLASH_1, &flash_info[i]);
                        flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
                        break;
                case 1:
-                       flash_get_size ((long *) PHYS_FLASH_2, &flash_info[i]);
+                       flash_get_size ((vu_long *) PHYS_FLASH_2, &flash_info[i]);
                        flash_get_offsets (PHYS_FLASH_2, &flash_info[i]);
                        break;
                default:
@@ -62,7 +62,7 @@ unsigned long flash_init (void)
 
        /* Protect monitor and environment sectors */
        flash_protect ( FLAG_PROTECT_SET,CFG_FLASH_BASE,CFG_FLASH_BASE + monitor_flash_len - 1,&flash_info[0] );
-       flash_protect ( FLAG_PROTECT_SET,CFG_ENV_ADDR,CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );
+       flash_protect ( FLAG_PROTECT_SET,CONFIG_ENV_ADDR,CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
 
        return size;
 }
@@ -101,13 +101,9 @@ void flash_print_info  (flash_info_t *info)
        }
 
        switch (info->flash_id & FLASH_TYPEMASK) {
-       case FLASH_AMLV128U:    printf ("AM29LV128ML (128Mbit, uniform sector size)\n");
-                               break;
-       case FLASH_AMLV320U:    printf ("AM29LV320ML (32Mbit, uniform sector size)\n");
-                               break;
        case FLASH_AMLV640U:    printf ("AM29LV640ML (64Mbit, uniform sector size)\n");
                                break;
-       case FLASH_AMLV320B:    printf ("AM29LV320MB (32Mbit, bottom boot sect)\n");
+       case FLASH_S29GL064M:   printf ("S29GL064M (64Mbit, top boot sector size)\n");
                                break;
        default:                printf ("Unknown Chip Type\n");
                                break;
@@ -174,17 +170,6 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
                debug ("Mirror Bit flash: addr[14] = %08lX  addr[15] = %08lX\n",
                        addr[14], addr[15]);
                switch(addr[14]) {
-               case AMD_ID_LV128U_2:
-                       if (addr[15] != AMD_ID_LV128U_3) {
-                               debug ("Chip: AMLV128U -> unknown\n");
-                               info->flash_id = FLASH_UNKNOWN;
-                       } else {
-                               debug ("Chip: AMLV128U\n");
-                               info->flash_id += FLASH_AMLV128U;
-                               info->sector_count = 256;
-                               info->size = 0x02000000;
-                       }
-                       break;                          /* => 32 MB     */
                case AMD_ID_LV640U_2:
                        if (addr[15] != AMD_ID_LV640U_3) {
                                debug ("Chip: AMLV640U -> unknown\n");
@@ -196,17 +181,17 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info)
                                info->size = 0x01000000;
                        }
                        break;                          /* => 16 MB     */
-               case AMD_ID_LV320B_2:
-                       if (addr[15] != AMD_ID_LV320B_3) {
-                               debug ("Chip: AMLV320B -> unknown\n");
+               case AMD_ID_GL064MT_2:
+                       if (addr[15] != AMD_ID_GL064MT_3) {
+                               debug ("Chip: S29GL064M-R3 -> unknown\n");
                                info->flash_id = FLASH_UNKNOWN;
                        } else {
-                               debug ("Chip: AMLV320B\n");
-                               info->flash_id += FLASH_AMLV320B;
-                               info->sector_count = 71;
-                               info->size = 0x00800000;
+                               debug ("Chip: S29GL064M-R3\n");
+                               info->flash_id += FLASH_S29GL064M;
+                               info->sector_count = 128;
+                               info->size = 0x01000000;
                        }
-                       break;                          /* =>  8 MB     */
+                       break;                          /* => 16 MB     */
                default:
                        debug ("Chip: *** unknown ***\n");
                        info->flash_id = FLASH_UNKNOWN;