Date:2011-08-04 10:12:40 (12 years 7 months ago)
Author:Xiangfu Liu
Commit:ad27b63155044cb7c913eec96498e7d096e67e01
Message:usbboot: remove useless NAND_READ_TO_RAM from host.

Files: usbboot/src/cmd.c (12 diffs)

Change Details

usbboot/src/cmd.c
134134{
135135    int cpu = get_ingenic_cpu();
136136    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
137        printf(" Device unboot! Boot it first!\n");
137        printf(" Device unboot! boot it first!\n");
138138        return;
139139    }
140140
...... 
221221{
222222    int cpu = get_ingenic_cpu();
223223    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
224        printf(" Device unboot! Boot it first!\n");
224        printf(" Device unboot! boot it first!\n");
225225        return -1;
226226    }
227    printf(" mark bad block : %d\n",nand_in->start);
227    printf(" Mark bad block : %d\n",nand_in->start);
228228    usb_send_data_address_to_ingenic(&ingenic_dev, nand_in->start);
229229    usb_ingenic_nand_ops(&ingenic_dev, NAND_MARK_BAD);
230230    usb_read_data_from_ingenic(&ingenic_dev, ret, 8);
...... 
250250
251251    int cpu = get_ingenic_cpu();
252252    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
253        printf(" Device unboot! Boot it first!\n");
253        printf(" Device unboot! boot it first!\n");
254254        goto err;
255255    }
256256
...... 
318318
319319        if (nand_in->start == 0 && hand.nand_ps == 4096 &&
320320            hand.fw_args.cpu_id == 0x4740) {
321            printf(" no check! End at Page: %d\n", cur_page);
321            printf(" No check! end at page: %d\n", cur_page);
322322            fflush(NULL);
323323            continue;
324324        }
...... 
332332                nand_markbad(&bad);
333333        }
334334
335        printf(" End at Page: %d\n", cur_page);
335        printf(" End at page: %d\n", cur_page);
336336        fflush(NULL);
337337    }
338338
...... 
361361
362362    int cpu = get_ingenic_cpu();
363363    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
364        printf(" Device unboot! Boot it first!\n");
364        printf(" Device unboot! boot it first!\n");
365365        return -1;
366366    }
367367
...... 
599599
600600    int cpu = get_ingenic_cpu();
601601    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
602        printf(" Device unboot! Boot it first!\n");
602        printf(" Device unboot! boot it first!\n");
603603        return -1;
604604    }
605605
...... 
622622
623623int nand_read(int mode)
624624{
625    unsigned int i,j;
625    unsigned int i, j, cpu;
626626    unsigned int start_addr, length, page_num;
627627    unsigned char csn;
628628    unsigned short temp = 0;
629    unsigned ram_addr = 0;
630629
631630    if (com_argc < 5) {
632631        printf(" Usage: nread (1) (2) (3) (4)\n"
633632               " 1:start page number\n"
634633               " 2:length in byte\n"
635634               " 3:device index number\n"
636               " 4:flash index number\n"
637               " 5:start SDRAM address\n");
635               " 4:flash index number\n");
638636        return -1;
639637    }
638
640639    init_nand_in();
641640
642    if (atoi(com_argv[4]) >= MAX_DEV_NUM) {
641    nand_in.start = atoi(com_argv[1]);
642    nand_in.length = atoi(com_argv[2]);
643    nand_in.dev = atoi(com_argv[3]);
644
645    csn = atoi(com_argv[4]);
646    start_addr = nand_in.start;
647    length = nand_in.length;
648
649    if (csn >= MAX_DEV_NUM) {
643650        printf(" Flash index number overflow!\n");
644651        return -1;
645652    }
646    (nand_in.cs_map)[atoi(com_argv[4])] = 1;
647    nand_in.start = atoi(com_argv[1]);
648    nand_in.length= atoi(com_argv[2]);
649    nand_in.dev = atoi(com_argv[3]);
650
651    if (com_argc = 6) {
652        ram_addr = strtoul(com_argv[5], NULL, 0);
653        printf("==%s==", com_argv[5]);
654    }
655    start_addr = nand_in.start;
656    length = nand_in.length;
653    nand_in.cs_map[csn] = 1;
657654
658655    if (start_addr > NAND_MAX_PAGE_NUM || length > NAND_MAX_PAGE_NUM ) {
659656        printf(" Page number overflow!\n");
660657        return -1;
661658    }
662    int cpu = get_ingenic_cpu();
659
660    cpu = get_ingenic_cpu();
663661    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
664        printf(" Device unboot! Boot it first!\n");
662        printf(" Device unboot! boot it first!\n");
665663        return -1;
666664    }
667    for (i = 0; i < nand_in.max_chip; i++)
668        if ((nand_in.cs_map)[i] != 0)
669            break;
670    if (i >= nand_in.max_chip) return 1;
671    csn = i;
672    printf(" Reading from No.%d device No.%d flash....\n",nand_in.dev,csn);
665
666    printf(" Reading from No.%d device No.%d flash....\n", nand_in.dev, csn);
673667
674668    page_num = length / hand.nand_ps +1;
675669
...... 
684678        temp = ((NO_OOB<<12) & 0xf000) + ((csn<<4) & 0xff0) +
685679            NAND_READ_RAW;
686680        break;
687    case NAND_READ_TO_RAM:
688        temp = ((NO_OOB<<12) & 0xf000) + ((csn<<4) & 0xff0) +
689            NAND_READ_TO_RAM;
690        printf(" Reading nand to RAM: 0x%x\n", ram_addr);
691        usb_ingenic_start(&ingenic_dev, VR_PROGRAM_START1, ram_addr);
692        break;
693681    default:
694        printf(" unknow mode!\n");
682        printf(" Unknow mode!\n");
695683        return -1;
696684    }
697685
...... 
704692
705693    for (j = 0; j < length; j++) {
706694        if (j % 16 == 0)
707        printf("\n 0x%08x : ",j);
695            printf("\n 0x%08x : ",j);
708696        printf("%02x ",(nand_in.buf)[j]);
709697    }
710698    printf("\n");
...... 
834822{
835823    int cpu = get_ingenic_cpu();
836824    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
837        printf(" Device unboot! Boot it first!\n");
825        printf(" Device unboot! boot it first!\n");
838826        return -1;
839827    }
840828
...... 
929917{
930918    int cpu = get_ingenic_cpu();
931919    if (cpu != BOOT4740 && cpu != BOOT4750 && cpu != BOOT4760) {
932        printf(" Device unboot! Boot it first!\n");
920        printf(" Device unboot! boot it first!\n");
933921        return -1;
934922    }
935923

Archive Download the corresponding diff file



interactive