usbd: remove yaffs related codes
authorMinkyu Kang <mk7.kang@samsung.com>
Wed, 8 Dec 2010 07:42:53 +0000 (16:42 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Wed, 8 Dec 2010 07:42:53 +0000 (16:42 +0900)
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
common/cmd_usbd.c

index 8ed02c2..5ca3a32 100644 (file)
@@ -40,12 +40,6 @@ static unsigned int part_id;
 static unsigned int write_part = 0;
 static unsigned int fs_offset = 0x0;
 
-#ifdef CONFIG_USE_YAFFS
-static unsigned int yaffs_len = 0;
-static unsigned char yaffs_data[2112];
-#define YAFFS_PAGE 2112
-#endif
-
 #define NAND_PAGE_SIZE 2048
 
 static unsigned long down_ram_addr;
@@ -750,10 +744,6 @@ static int write_fat_file(struct usbd_ops *usbd, char *file_name,
 static int write_file_system(char *ramaddr, ulong len, char *offset,
                char *length, int part_num, int ubi_update)
 {
-#ifdef CONFIG_USE_YAFFS
-       int actual_len = 0;
-       int yaffs_write = 0;
-#endif
        int ret = 0;
 
 #ifdef CONFIG_CMD_UBI
@@ -772,41 +762,11 @@ static int write_file_system(char *ramaddr, ulong len, char *offset,
                nand_cmd(0, offset, length, NULL);
        }
 
-#ifdef CONFIG_USE_YAFFS
-       /* if using yaffs, wirte size must be 2112*X
-        * so, must have to realloc, and writing */
-       if (!strcmp("yaffs", getenv(parts[part_num]->name))) {
-               yaffs_write = 1;
-
-               memcpy((void *)down_ram_addr, yaffs_data, yaffs_len);
-
-               actual_len = len + yaffs_len;
-               yaffs_len = actual_len % YAFFS_PAGE;
-               len = actual_len - yaffs_len;
-
-               memset(yaffs_data, 0x00, YAFFS_PAGE);
-               memcpy(yaffs_data, (char *)down_ram_addr + len, yaffs_len);
-       }
-#endif
-
        sprintf(offset, "0x%x", (uint)(parts[part_num]->offset + fs_offset));
        sprintf(length, "0x%x", (uint)len);
 
-#ifdef CONFIG_USE_YAFFS
-       if (yaffs_write)
-               ret = nand_cmd(2, ramaddr, offset, length);
-       else
-               ret = nand_cmd(1, ramaddr, offset, length);
-
-       if (!strcmp("yaffs", getenv(parts[part_num]->name)))
-               fs_offset += len / YAFFS_PAGE * NAND_PAGE_SIZE;
-       else
-               fs_offset += len;
-
-#else
        fs_offset += len;
        ret = nand_cmd(1, ramaddr, offset, length);
-#endif
 
        return ret;
 }
@@ -905,11 +865,6 @@ static int process_data(struct usbd_ops *usbd)
        case COMMAND_DOWNLOAD_IMAGE:
                printf("\nCOMMAND_DOWNLOAD_IMAGE\n");
 
-#ifdef CONFIG_USE_YAFFS
-               usbd->recv_setup((char *)down_ram_addr + yaffs_len, (int)len);
-               printf("Download to 0x%08x, %d bytes\n",
-                               (uint)down_ram_addr + yaffs_len, (int)len);
-#else
                if (arg)
                        down_ram_addr = usbd->ram_addr + 0x1000000;
                else
@@ -918,7 +873,7 @@ static int process_data(struct usbd_ops *usbd)
                usbd->recv_setup((char *)down_ram_addr, (int)len);
                printf("Download to 0x%08x, %d bytes\n",
                                (uint)down_ram_addr, (int)len);
-#endif
+
                /* response */
                send_ack(usbd, STATUS_DONE);
 
@@ -1408,9 +1363,6 @@ out:
        if (flag) {
                write_part = 0;
                fs_offset = 0;
-#ifdef CONFIG_USE_YAFFS
-               yaffs_len = 0;
-#endif
        }
 
        return 1;