From a834e8036285d61e99445f376bf36c8e583592c7 Mon Sep 17 00:00:00 2001 From: xiangfu Date: Thu, 30 Apr 2009 17:26:14 +0000 Subject: [PATCH] -put all the configure file operation to ingenic.c -change usb.c to ingenic_usb.c -finish part of nprog command -try to init the ingenic usb in main.c -try to make code more clear. --- flash-tool/Makefile | 5 +- flash-tool/cmd.c | 381 ++++++++++++++-------------- flash-tool/cmd.h | 2 +- flash-tool/command_line.c | 2 +- flash-tool/ingenic_cfg.c | 197 ++++++++++++++ flash-tool/ingenic_cfg.h | 33 +++ flash-tool/{usb.c => ingenic_usb.c} | 2 + flash-tool/ingenic_usb.h | 2 +- flash-tool/main.c | 13 +- flash-tool/usb_boot_defines.h | 36 +-- 10 files changed, 461 insertions(+), 212 deletions(-) create mode 100644 flash-tool/ingenic_cfg.c create mode 100644 flash-tool/ingenic_cfg.h rename flash-tool/{usb.c => ingenic_usb.c} (99%) diff --git a/flash-tool/Makefile b/flash-tool/Makefile index 2b9fbff..4592424 100644 --- a/flash-tool/Makefile +++ b/flash-tool/Makefile @@ -34,8 +34,9 @@ CFLAGS += -pedantic -Wall -W -O1 -g3 -std=gnu99 LDFLAGS += -lusb -lconfuse BINARY_NAME = inflash -SRC_C= main.c usb.c cmd.c command_line.c -SRC_H= ingenic_usb.h usb_boot_defines.h command_line.h cmd.h config.h +SRC_C= main.c ingenic_cfg.c ingenic_usb.c cmd.c command_line.c +SRC_H= ingenic_cfg.h ingenic_usb.h usb_boot_defines.h \ + command_line.h cmd.h config.h SRC_O= $(SRC_C:.c=.o) $(BINARY_NAME): $(SRC_O) $(SRC_H) Makefile diff --git a/flash-tool/cmd.c b/flash-tool/cmd.c index 61ab81c..128acf1 100644 --- a/flash-tool/cmd.c +++ b/flash-tool/cmd.c @@ -30,182 +30,27 @@ #include #include #include -#include #include #include "cmd.h" +#include "ingenic_cfg.h" extern int com_argc; extern char com_argv[MAX_ARGC][MAX_COMMAND_LENGTH]; +struct ingenic_dev ingenic_dev; +struct hand_t hand; + static struct nand_in_t nand_in; static struct nand_out_t nand_out; -static struct hand_t hand; unsigned int total_size; unsigned char code_buf[4 * 512 * 1024]; unsigned char cs[16]; -void init_hand_def(void) -{ - /* nand flash info */ - /* hand.nand_start=0;important !!!! */ - hand.pt = JZ4740; /* cpu type */ - hand.nand_bw=8; - hand.nand_rc=3; - hand.nand_ps=2048; - hand.nand_ppb=64; - hand.nand_eccpos = 6; - hand.nand_bbpage = 0; - hand.nand_bbpos = 0; - hand.nand_force_erase=0; - /* hand.nand_ids=0; */ /* vendor_id & device_id */ - hand.fw_args.cpu_id = 0x4740; - hand.fw_args.ext_clk = 12; - hand.fw_args.cpu_speed = 336 / hand.fw_args.ext_clk; - hand.fw_args.phm_div = 4; - hand.fw_args.use_uart = 0; - hand.fw_args.boudrate = 57600; - hand.fw_args.bus_width = 0; - hand.fw_args.bank_num = 1; - hand.fw_args.row_addr = 13; - hand.fw_args.col_addr = 9; - hand.fw_args.is_mobile = 0; - hand.fw_args.is_busshare = 1; -} - -static int parse_configure(char * file_path) -{ - cfg_opt_t opts[] = { - CFG_SIMPLE_INT("EXTCLK", &hand.fw_args.ext_clk), - CFG_SIMPLE_INT("CPUSPEED", &hand.fw_args.cpu_speed), - CFG_SIMPLE_INT("PHMDIV", &hand.fw_args.phm_div), - CFG_SIMPLE_INT("BOUDRATE", &hand.fw_args.boudrate), - CFG_SIMPLE_INT("USEUART", &hand.fw_args.use_uart), - - CFG_SIMPLE_INT("BUSWIDTH", &hand.fw_args.bus_width), - CFG_SIMPLE_INT("BANKS", &hand.fw_args.bank_num), - CFG_SIMPLE_INT("ROWADDR", &hand.fw_args.row_addr), - CFG_SIMPLE_INT("COLADDR", &hand.fw_args.col_addr), - - CFG_SIMPLE_INT("ISMOBILE", &hand.fw_args.is_mobile), - CFG_SIMPLE_INT("ISBUSSHARE", &hand.fw_args.is_busshare), - CFG_SIMPLE_INT("DEBUGOPS", &hand.fw_args.debug_ops), - CFG_SIMPLE_INT("PINNUM", &hand.fw_args.pin_num), - CFG_SIMPLE_INT("START", &hand.fw_args.start), - CFG_SIMPLE_INT("SIZE", &hand.fw_args.size), - - CFG_SIMPLE_INT("NAND_BUSWIDTH", &hand.nand_bw), - CFG_SIMPLE_INT("NAND_ROWCYCLES", &hand.nand_rc), - CFG_SIMPLE_INT("NAND_PAGESIZE", &hand.nand_ps), - CFG_SIMPLE_INT("NAND_PAGEPERBLOCK", &hand.nand_ppb), - CFG_SIMPLE_INT("NAND_FORCEERASE", &hand.nand_force_erase), - CFG_SIMPLE_INT("NAND_OOBSIZE", &hand.nand_os), - CFG_SIMPLE_INT("NAND_ECCPOS", &hand.nand_eccpos), - CFG_SIMPLE_INT("NAND_BADBLACKPOS", &hand.nand_bbpos), - CFG_SIMPLE_INT("NAND_BADBLACKPAGE", &hand.nand_bbpage), - CFG_SIMPLE_INT("NAND_PLANENUM", &hand.nand_plane), - CFG_SIMPLE_INT("NAND_BCHBIT", &hand.nand_bchbit), - CFG_SIMPLE_INT("NAND_WPPIN", &hand.nand_wppin), - CFG_SIMPLE_INT("NAND_BLOCKPERCHIP", &hand.nand_bbpage), - - CFG_END() - }; - - cfg_t *cfg; - cfg = cfg_init(opts, 0); - if (cfg_parse(cfg, file_path) == CFG_PARSE_ERROR) - return -1; - cfg_free(cfg); - - hand.fw_args.cpu_id = 0x4740; - if (hand.fw_args.bus_width == 32) - hand.fw_args.bus_width = 0 ; - else - hand.fw_args.bus_width = 1 ; - hand.fw_args.bank_num = hand.fw_args.bank_num / 4; - hand.fw_args.cpu_speed = hand.fw_args.cpu_speed / hand.fw_args.ext_clk; - - total_size = (unsigned int) - (2 << (hand.fw_args.row_addr + hand.fw_args.col_addr - 1)) * 2 - * (hand.fw_args.bank_num + 1) * 2 - * (2 - hand.fw_args.bus_width); - - return 1; -} - -int check_dump_cfg() -{ - printf("\n Now checking whether all configure args valid: "); - /* check PLL */ - if (hand.fw_args.ext_clk > 27 || hand.fw_args.ext_clk < 12 ) { - printf("\n EXTCLK setting invalid!"); - return 0; - } - if (hand.fw_args.phm_div > 32 || hand.fw_args.ext_clk < 2 ) { - printf("\n PHMDIV setting invalid!"); - return 0; - } - if ( (hand.fw_args.cpu_speed * hand.fw_args.ext_clk ) % 12 != 0 ) { - printf("\n CPUSPEED setting invalid!"); - return 0; - } - - /* check SDRAM */ - if (hand.fw_args.bus_width > 1 ) { - printf("\n SDRAMWIDTH setting invalid!"); - return 0; - } - if (hand.fw_args.bank_num > 1 ) { - printf("\n BANKNUM setting invalid!"); - return 0; - } - if (hand.fw_args.row_addr > 13 && hand.fw_args.row_addr < 11 ) { - printf("\n ROWADDR setting invalid!"); - return 0; - } - if (hand.fw_args.col_addr > 13 && hand.fw_args.col_addr < 11 ) { - printf("\n COLADDR setting invalid!"); - return 0; - } - - /* check NAND */ - if ( hand.nand_ps < 2048 && hand.nand_os > 16 ) { - printf("\n PAGESIZE or OOBSIZE setting invalid!"); - return 0; - } - if ( hand.nand_ps < 2048 && hand.nand_ppb > 32 ) { - printf("\n PAGESIZE or PAGEPERBLOCK setting invalid!"); - return 0; - } - - if ( hand.nand_ps > 512 && hand.nand_os <= 16 ) { - printf("\n PAGESIZE or OOBSIZE setting invalid!"); - return 0; - } - if ( hand.nand_ps > 512 && hand.nand_ppb < 64 ) { - printf("\n PAGESIZE or PAGEPERBLOCK setting invalid!"); - return 0; - } - - printf("\n Current device information:"); - printf(" CPU is Jz%x",hand.fw_args.cpu_id); - printf("\n Crystal work at %dMHz, the CCLK up to %dMHz and PMH_CLK up to %dMHz", - hand.fw_args.ext_clk, - (unsigned int)hand.fw_args.cpu_speed * hand.fw_args.ext_clk, - ((unsigned int)hand.fw_args.cpu_speed * hand.fw_args.ext_clk) / hand.fw_args.phm_div); - - printf("\n Total SDRAM size is %d MB, work in %d bank and %d bit mode", - total_size / 0x100000, 2 * (hand.fw_args.bank_num + 1), 16 * (2 - hand.fw_args.bus_width)); - - /* printf("\n Nand page size %d, ECC offset %d, ", - hand.nand_ps,hand.nand_eccpos); - - printf("bad block ID %d, ",hand.nand_bbpage); - - printf("use %d plane mode",hand.nand_plane); */ - - printf("\n"); - return 1; -} +static const char IMAGE_TYPE[][30] = { + "with oob and ecc", + "with oob and without ecc", + "without oob", +}; static int load_file(struct ingenic_dev *ingenic_dev, const char *file_path) { @@ -220,7 +65,8 @@ static int load_file(struct ingenic_dev *ingenic_dev, const char *file_path) status = stat(file_path, &fstat); if (status < 0) { - fprintf(stderr, "Error - can't get file size from '%s': %s\n", file_path, strerror(errno)); + fprintf(stderr, "Error - can't get file size from '%s': %s\n", + file_path, strerror(errno)); goto out; } @@ -228,21 +74,24 @@ static int load_file(struct ingenic_dev *ingenic_dev, const char *file_path) ingenic_dev->file_buff = malloc(ingenic_dev->file_len); if (!ingenic_dev->file_buff) { - fprintf(stderr, "Error - can't allocate memory to read file '%s': %s\n", file_path, strerror(errno)); + fprintf(stderr, "Error - can't allocate memory to read file '%s': %s\n", + file_path, strerror(errno)); return -1; } fd = open(file_path, O_RDONLY); if (fd < 0) { - fprintf(stderr, "Error - can't open file '%s': %s\n", file_path, strerror(errno)); + fprintf(stderr, "Error - can't open file '%s': %s\n", + file_path, strerror(errno)); goto out; } status = read(fd, ingenic_dev->file_buff, ingenic_dev->file_len); if (status < ingenic_dev->file_len) { - fprintf(stderr, "Error - can't read file '%s': %s\n", file_path, strerror(errno)); + fprintf(stderr, "Error - can't read file '%s': %s\n", + file_path, strerror(errno)); goto close; } @@ -256,22 +105,11 @@ out: return res; } -int boot(char *stage1_path, char *stage2_path, char *config_path ){ - struct ingenic_dev ingenic_dev; +int boot(char *stage1_path, char *stage2_path){ int res = 0; int status; - memset(&ingenic_dev, 0, sizeof(struct ingenic_dev)); - memset(&hand.fw_args, 0, sizeof(struct fw_args_t)); - - init_hand_def(); - if (parse_configure(config_path) < 1) - goto out; - - if (usb_ingenic_init(&ingenic_dev) < 1) - goto out; - status = usb_get_ingenic_cpu(&ingenic_dev); switch (status) { case 1: /* Jz4740v1 */ @@ -317,7 +155,6 @@ int boot(char *stage1_path, char *stage2_path, char *config_path ){ if (usb_ingenic_upload(&ingenic_dev, 2) < 1) goto cleanup; - check_dump_cfg(); } res = 1; @@ -329,6 +166,173 @@ out: usb_ingenic_cleanup(&ingenic_dev); return res; } + +/* nand function */ +int nand_program_check(struct nand_in_t *nand_in, + struct nand_out_t *nand_out) +{ + + return -1; +} + +int nand_erase(struct nand_in_t *nand_in) +{ +#if 0 + unsigned int start_blk, blk_num, end_block; + int i; + + start_blk = nand_in->start; + blk_num = nand_in->length; + if (start_blk > (unsigned int)NAND_MAX_BLK_NUM) { + printf("\n Start block number overflow!"); + return -1; + } + if (blk_num > (unsigned int)NAND_MAX_BLK_NUM) { + printf("\n Length block number overflow!"); + return -1; + } + + if (usb_get_ingenic_cpu(&ingenic_dev) < 3) { + printf("\n Device unboot! Boot it first!"); + return -1; + } + + for (i = 0; i < nand_in->max_chip; i++) { + if ((nand_in->cs_map)[i]==0) + continue; + printf("\n Erasing No.%d device No.%d flash......", + nand_in->dev, i); + + JZ4740_USB_SET_DATA_ADDRESS(start_blk,hDevice); + JZ4740_USB_SET_DATA_LENGTH(blk_num,hDevice); + unsigned short temp = ((i<<4) & 0xff0) + NAND_ERASE; + JZ4740_USB_NAND_OPS(temp,hDevice); + ReadFile(hDevice, ret, 8, &nRead, NULL); + printf(" Finish!"); + } + Handle_Close(); + end_block = ((ret[3]<<24)|(ret[2]<<16)|(ret[1]<<8)|(ret[0]<<0)) / Hand.nand_ppb; + printf("\n Operation end position : %d ",end_block); + if ( !Hand.nand_force_erase ) //not force erase ,show bad block infomation + { + printf("\n There are marked bad blocks :%d ",end_block - start_blk - blk_num ); + } + else //force erase ,no bad block infomation can show + { + printf("\n Force erase ,no bad block infomation !" ); + } +#endif + return 1; +} + +int nand_program_file(struct nand_in_t *nand_in, + struct nand_out_t *nand_out, + char *fname) +{ + + int flen, m, j, k; + unsigned int start_page = 0, page_num, code_len, offset, transfer_size; + FILE *fp; + unsigned char status_buf[32]; + struct nand_in_t n_in; + struct nand_out_t n_out; + +#if 0 + /* nand_out->status = (unsigned char *)malloc(nand_in->max_chip * sizeof(unsigned char)); */ + nand_out->status = status_buf; + for (i=0;imax_chip;i++) + (nand_out->status)[i] = 0; /* set all status to fail */ +#endif + fp = fopen(fname,"rb"); + if (fp == NULL) { + printf("\n Can not open file !"); + return 0; + } + + printf("\n Programing No.%d device...",nand_in->dev); + fseek(fp,0,SEEK_END); + flen=ftell(fp); + n_in.start = nand_in->start / hand.nand_ppb; + if (nand_in->option == NO_OOB) { + if (flen % (hand.nand_ppb * hand.nand_ps) == 0) + n_in.length = flen / (hand.nand_ps * hand.nand_ppb); + else + n_in.length = flen / (hand.nand_ps * hand.nand_ppb) + 1; + } else { + if (flen % (hand.nand_ppb * (hand.nand_ps + hand.nand_os)) == 0) + n_in.length = flen / ((hand.nand_ps + hand.nand_os) * hand.nand_ppb); + else + n_in.length = flen / ((hand.nand_ps + hand.nand_os) * hand.nand_ppb) + 1; + } + /* printf(" length %d flen %d \n",n_in.length,flen); */ + n_in.cs_map = nand_in->cs_map; + n_in.dev = nand_in->dev; + n_in.max_chip = nand_in->max_chip; + if (nand_erase(&n_in)!=1) + return -1; + if (nand_in->option == NO_OOB) + transfer_size = (hand.nand_ppb * hand.nand_ps); + else + transfer_size = (hand.nand_ppb * (hand.nand_ps + hand.nand_os)); + m = flen / transfer_size; + j = flen % transfer_size; + fseek(fp,0,SEEK_SET); /* file point return to begin */ + offset = 0; + printf("\n Total size to send in byte is :%d",flen); + printf("\n Image type : %s",IMAGE_TYPE[nand_in->option]); + printf("\n It will cause %d times buffer transfer.",m+1); +#if 0 + for (i = 0; i < nand_in->max_chip; i++) + (nand_out->status)[i] = 1; /* set all status to success! */ +#endif + for (k = 0; k < m; k++) { + if (nand_in->option == NO_OOB) { + page_num = transfer_size / hand.nand_ps; + } else { + page_num = transfer_size / (hand.nand_ps + hand.nand_os); + } + code_len = transfer_size; + fread(code_buf, 1, code_len, fp); /* read code from file to buffer */ + printf("\n No.%d Programming...",k+1); + nand_in->length = code_len; /* code length,not page number! */ + nand_in->buf = code_buf; + start_page = nand_program_check(nand_in,&n_out); + if ( start_page - nand_in->start > hand.nand_ppb ) + printf("\n Skip a old bad block !"); + nand_in->start = start_page; +#if 0 + for (i = 0; i < nand_in->max_chip; i++) { + (nand_out->status)[i] = (nand_out->status)[i] * (n_out.status)[i]; + } +#endif + /* offset += code_len - 1; */ + offset += code_len ; + /* start_page += page_num; */ + /* nand_in->start += page_num; */ + fseek(fp,offset,SEEK_SET); + } + + if (j) { + j += hand.nand_ps - (j % hand.nand_ps); + memset(code_buf,0,j); /* set all to null */ + fread(code_buf,1,j,fp); /* read code from file to buffer */ + nand_in->length = j; + nand_in->buf = code_buf; + printf("\n No.%d Programming...",k+1); + start_page = nand_program_check(nand_in,&n_out); + if ( start_page - nand_in->start > hand.nand_ppb ) + printf(" Skip a old bad block !"); +#if 0 + for (i=0;imax_chip;i++) { + (nand_out->status)[i] = (nand_out->status)[i] * (n_out.status)[i]; + } +#endif + } + + fclose(fp); + return 1; +} + int nprog(void) { unsigned int i; @@ -368,13 +372,14 @@ int nprog(void) nand_in.option = NO_OOB; else printf("%s", help); -#if 0 - if (hand.nand_plane > 1) - /* API_Nand_Program_File_Planes(&nand_in,&nand_out, image_file); */ - else - /* API_Nand_Program_File(&nand_in,&nand_out, image_file); */ - printf("\n Flash check result:"); + if (hand.nand_plane > 1) + ;/* nand_program_file_planes(&nand_in,&nand_out, image_file); */ + else + nand_program_file(&nand_in,&nand_out, image_file); + +#if 0 + printf("\n Flash check result:"); for (i = 0; i < 16; i++) printf(" %d", (nand_out.status)[i]); #endif @@ -383,7 +388,7 @@ int nprog(void) nand_in.dev, (nand_in.cs_map)[atoi(com_argv[4])], nand_in.option); - printf("\n not implement yet!! "); + printf("\n not implement yet!! just test"); return 1; } diff --git a/flash-tool/cmd.h b/flash-tool/cmd.h index 5c1b11b..28937d8 100644 --- a/flash-tool/cmd.h +++ b/flash-tool/cmd.h @@ -26,7 +26,7 @@ #define MAX_ARGC 10 #define MAX_COMMAND_LENGTH 100 -int boot(char *stage1_path, char *stage2_path, char *config_path); +int boot(char *stage1_path, char *stage2_path); int nprog(void); #endif /* __CMD_H__ */ diff --git a/flash-tool/command_line.c b/flash-tool/command_line.c index ce53788..3837d96 100644 --- a/flash-tool/command_line.c +++ b/flash-tool/command_line.c @@ -175,7 +175,7 @@ int command_handle(char *buf) printf("\n exiting inflash software\n"); exit(EXIT_SUCCESS); case 20: - return boot(STAGE1_FILE_PATH, STAGE2_FILE_PATH, CONFIG_FILE_PATH); + return boot(STAGE1_FILE_PATH, STAGE2_FILE_PATH); default: printf("\n Command not support!"); return -1; diff --git a/flash-tool/ingenic_cfg.c b/flash-tool/ingenic_cfg.c new file mode 100644 index 0000000..38ce84e --- /dev/null +++ b/flash-tool/ingenic_cfg.c @@ -0,0 +1,197 @@ +/* + * put all the configure operate to this file + * + * (C) Copyright 2009 + * Author: Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 3 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA + */ + +#include +#include "ingenic_cfg.h" +#include "usb_boot_defines.h" + +extern unsigned int total_size; + +int hand_init_def(struct hand_t *hand) +{ + /* nand flash info */ + /* hand.nand_start=0; */ /* important !!!! */ + (*hand).pt = JZ4740; /* cpu type */ + (*hand).nand_bw = 8; + (*hand).nand_rc = 3; + (*hand).nand_ps = 2048; + (*hand).nand_ppb = 64; + (*hand).nand_eccpos = 6; + (*hand).nand_bbpage = 0; + (*hand).nand_bbpos = 0; + (*hand).nand_force_erase = 0; + /* hand.nand_ids=0; */ /* vendor_id & device_id */ + (*hand).fw_args.cpu_id = 0x4740; + (*hand).fw_args.ext_clk = 12; + (*hand).fw_args.cpu_speed = 225 / (*hand).fw_args.ext_clk; + (*hand).fw_args.phm_div = 3; + (*hand).fw_args.use_uart = 0; + (*hand).fw_args.boudrate = 57600; + (*hand).fw_args.bus_width = 0; + (*hand).fw_args.bank_num = 1; + (*hand).fw_args.row_addr = 13; + (*hand).fw_args.col_addr = 9; + (*hand).fw_args.is_mobile = 0; + (*hand).fw_args.is_busshare = 1; + + return 1; +} + +int check_dump_cfg(struct hand_t *hand) +{ + printf("\n Now checking whether all configure args valid: "); + /* check PLL */ + if ((*hand).fw_args.ext_clk > 27 || (*hand).fw_args.ext_clk < 12) { + printf("\n EXTCLK setting invalid!"); + return 0; + } + if ((*hand).fw_args.phm_div > 32 || (*hand).fw_args.ext_clk < 2) { + printf("\n PHMDIV setting invalid!"); + return 0; + } + if (((*hand).fw_args.cpu_speed * (*hand).fw_args.ext_clk ) % 12 != 0) { + printf("\n CPUSPEED setting invalid!"); + return 0; + } + + /* check SDRAM */ + if ((*hand).fw_args.bus_width > 1 ) { + printf("\n SDRAMWIDTH setting invalid!"); + return 0; + } + if ((*hand).fw_args.bank_num > 1 ) { + printf("\n BANKNUM setting invalid!"); + return 0; + } + if ((*hand).fw_args.row_addr > 13 && (*hand).fw_args.row_addr < 11 ) { + printf("\n ROWADDR setting invalid!"); + return 0; + } + if ((*hand).fw_args.col_addr > 13 && (*hand).fw_args.col_addr < 11 ) { + printf("\n COLADDR setting invalid!"); + return 0; + } + + /* check NAND */ + if ( (*hand).nand_ps < 2048 && (*hand).nand_os > 16 ) { + printf("\n PAGESIZE or OOBSIZE setting invalid!"); + return 0; + } + if ( (*hand).nand_ps < 2048 && (*hand).nand_ppb > 32 ) { + printf("\n PAGESIZE or PAGEPERBLOCK setting invalid!"); + return 0; + } + + if ( (*hand).nand_ps > 512 && (*hand).nand_os <= 16 ) { + printf("\n PAGESIZE or OOBSIZE setting invalid!"); + return 0; + } + if ( (*hand).nand_ps > 512 && (*hand).nand_ppb < 64 ) { + printf("\n PAGESIZE or PAGEPERBLOCK setting invalid!"); + return 0; + } + + printf("\n Current device information:"); + printf(" CPU is Jz%x",(*hand).fw_args.cpu_id); + printf("\n Crystal work at %dMHz, the CCLK up to %dMHz and PMH_CLK up to %dMHz", + (*hand).fw_args.ext_clk, + (unsigned int)(*hand).fw_args.cpu_speed * (*hand).fw_args.ext_clk, + ((unsigned int)(*hand).fw_args.cpu_speed * (*hand).fw_args.ext_clk) / (*hand).fw_args.phm_div); + + printf("\n Total SDRAM size is %d MB, work in %d bank and %d bit mode", + total_size / 0x100000, 2 * ((*hand).fw_args.bank_num + 1), + 16 * (2 - (*hand).fw_args.bus_width)); + + /* printf("\n Nand page size %d, ECC offset %d, ", + (*hand).nand_ps,(*hand).nand_eccpos); + + printf("bad block ID %d, ",(*hand).nand_bbpage); + + printf("use %d plane mode",(*hand).nand_plane); */ + + printf("\n"); + return 1; +} + +int parse_configure(struct hand_t *hand, char * file_path) +{ + hand_init_def(hand); + + cfg_opt_t opts[] = { + CFG_SIMPLE_INT("EXTCLK", &(*hand).fw_args.ext_clk), + CFG_SIMPLE_INT("CPUSPEED", &(*hand).fw_args.cpu_speed), + CFG_SIMPLE_INT("PHMDIV", &(*hand).fw_args.phm_div), + CFG_SIMPLE_INT("BOUDRATE", &(*hand).fw_args.boudrate), + CFG_SIMPLE_INT("USEUART", &(*hand).fw_args.use_uart), + + CFG_SIMPLE_INT("BUSWIDTH", &(*hand).fw_args.bus_width), + CFG_SIMPLE_INT("BANKS", &(*hand).fw_args.bank_num), + CFG_SIMPLE_INT("ROWADDR", &(*hand).fw_args.row_addr), + CFG_SIMPLE_INT("COLADDR", &(*hand).fw_args.col_addr), + + CFG_SIMPLE_INT("ISMOBILE", &(*hand).fw_args.is_mobile), + CFG_SIMPLE_INT("ISBUSSHARE", &(*hand).fw_args.is_busshare), + CFG_SIMPLE_INT("DEBUGOPS", &(*hand).fw_args.debug_ops), + CFG_SIMPLE_INT("PINNUM", &(*hand).fw_args.pin_num), + CFG_SIMPLE_INT("START", &(*hand).fw_args.start), + CFG_SIMPLE_INT("SIZE", &(*hand).fw_args.size), + + CFG_SIMPLE_INT("NAND_BUSWIDTH", &(*hand).nand_bw), + CFG_SIMPLE_INT("NAND_ROWCYCLES", &(*hand).nand_rc), + CFG_SIMPLE_INT("NAND_PAGESIZE", &(*hand).nand_ps), + CFG_SIMPLE_INT("NAND_PAGEPERBLOCK", &(*hand).nand_ppb), + CFG_SIMPLE_INT("NAND_FORCEERASE", &(*hand).nand_force_erase), + CFG_SIMPLE_INT("NAND_OOBSIZE", &(*hand).nand_os), + CFG_SIMPLE_INT("NAND_ECCPOS", &(*hand).nand_eccpos), + CFG_SIMPLE_INT("NAND_BADBLACKPOS", &(*hand).nand_bbpos), + CFG_SIMPLE_INT("NAND_BADBLACKPAGE", &(*hand).nand_bbpage), + CFG_SIMPLE_INT("NAND_PLANENUM", &(*hand).nand_plane), + CFG_SIMPLE_INT("NAND_BCHBIT", &(*hand).nand_bchbit), + CFG_SIMPLE_INT("NAND_WPPIN", &(*hand).nand_wppin), + CFG_SIMPLE_INT("NAND_BLOCKPERCHIP", &(*hand).nand_bbpage), + + CFG_END() + }; + + cfg_t *cfg; + cfg = cfg_init(opts, 0); + if (cfg_parse(cfg, file_path) == CFG_PARSE_ERROR) + return -1; + cfg_free(cfg); + + (*hand).fw_args.cpu_id = 0x4740; + if ((*hand).fw_args.bus_width == 32) + (*hand).fw_args.bus_width = 0 ; + else + (*hand).fw_args.bus_width = 1 ; + (*hand).fw_args.bank_num = (*hand).fw_args.bank_num / 4; + (*hand).fw_args.cpu_speed = (*hand).fw_args.cpu_speed / (*hand).fw_args.ext_clk; + + total_size = (unsigned int) + (2 << ((*hand).fw_args.row_addr + (*hand).fw_args.col_addr - 1)) * 2 + * ((*hand).fw_args.bank_num + 1) * 2 + * (2 - (*hand).fw_args.bus_width); + + if (check_dump_cfg(hand) < 1) + return -1; + + return 1; +} diff --git a/flash-tool/ingenic_cfg.h b/flash-tool/ingenic_cfg.h new file mode 100644 index 0000000..3eca4b2 --- /dev/null +++ b/flash-tool/ingenic_cfg.h @@ -0,0 +1,33 @@ +/* + * put all the configure operate to this file + * + * (C) Copyright 2009 + * Author: Marek Lindner + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 3 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA + */ + +#ifndef __INGENIC_CFG_H__ +#define __INGENIC_CFG_H__ + +#include "usb_boot_defines.h" + +#define CONFIG_FILE_PATH "usb_boot.cfg" + +int hand_init_def(struct hand_t *hand); +int check_dump_cfg(struct hand_t *hand); +int parse_configure(struct hand_t *hand, char * file_path); + +#endif /*__INGENIC_CFG_H__ */ diff --git a/flash-tool/usb.c b/flash-tool/ingenic_usb.c similarity index 99% rename from flash-tool/usb.c rename to flash-tool/ingenic_usb.c index 39711be..7eb7b06 100644 --- a/flash-tool/usb.c +++ b/flash-tool/ingenic_usb.c @@ -91,6 +91,8 @@ int usb_ingenic_init(struct ingenic_dev *ingenic_dev) { int num_ingenic, status = -1; + memset(ingenic_dev, 0, sizeof(struct ingenic_dev)); + usb_init(); /* usb_set_debug(255); */ usb_find_busses(); diff --git a/flash-tool/ingenic_usb.h b/flash-tool/ingenic_usb.h index 70d1299..a786fda 100644 --- a/flash-tool/ingenic_usb.h +++ b/flash-tool/ingenic_usb.h @@ -48,7 +48,7 @@ #define STAGE1_FILE_PATH "fw.bin" #define STAGE2_FILE_PATH "usb_boot.bin" -#define CONFIG_FILE_PATH "usb_boot.cfg" + #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) struct ingenic_dev { diff --git a/flash-tool/main.c b/flash-tool/main.c index bf04fbe..1aee3d1 100644 --- a/flash-tool/main.c +++ b/flash-tool/main.c @@ -30,6 +30,11 @@ #include "usb.h" #include "config.h" #include "command_line.h" +#include "ingenic_usb.h" +#include "ingenic_cfg.h" + +extern struct ingenic_dev ingenic_dev; +extern struct hand_t hand; static void help(void) { @@ -57,9 +62,15 @@ int main(int argc, char **argv) if ((getuid()) || (getgid())) { fprintf(stderr, "Error - you must be root to run '%s'\n", argv[0]); - return -1; + return EXIT_FAILURE; } + if (usb_ingenic_init(&ingenic_dev) < 1) + return EXIT_FAILURE; + + if (parse_configure(&hand, CONFIG_FILE_PATH) < 1) + return EXIT_FAILURE; + while (1) { int c, option_index = 0; c = getopt_long(argc, argv, "hv", opts, diff --git a/flash-tool/usb_boot_defines.h b/flash-tool/usb_boot_defines.h index 4933d6d..07e6662 100644 --- a/flash-tool/usb_boot_defines.h +++ b/flash-tool/usb_boot_defines.h @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA */ -#ifndef __JZ4740_USBDEFINES__H_ -#define __JZ4740_USBDEFINES__H_ +#ifndef __USB_BOOT_DEFINES_H__ +#define __USB_BOOT_DEFINES_H__ /* #define dprintf(x...) printf(x) */ #define SDRAM_SIZE ( 16 * 1024 * 1024 ) @@ -122,24 +122,24 @@ struct fw_args_t { /* unsigned char align2; */ } __attribute__((packed)); -struct hand_t { +struct hand_t { /* nand flash info */ int pt; /* cpu type */ - int nand_bw; /* bus width */ - int nand_rc; /* row cycle */ - int nand_ps; /* page size */ - int nand_ppb; /* page number per block */ - int nand_force_erase; - int nand_pn; /* page number in total */ - int nand_os; /* oob size */ - int nand_eccpos; - int nand_bbpage; - int nand_bbpos; - int nand_plane; - int nand_bchbit; - int nand_wppin; - int nand_bpc; /* block number per chip */ + unsigned int nand_bw; /* bus width */ + unsigned int nand_rc; /* row cycle */ + unsigned int nand_ps; /* page size */ + unsigned int nand_ppb; /* page number per block */ + unsigned int nand_force_erase; + unsigned int nand_pn; /* page number in total */ + unsigned int nand_os; /* oob size */ + unsigned int nand_eccpos; + unsigned int nand_bbpage; + unsigned int nand_bbpos; + unsigned int nand_plane; + unsigned int nand_bchbit; + unsigned int nand_wppin; + unsigned int nand_bpc; /* block number per chip */ struct fw_args_t fw_args; } __attribute__((packed)); @@ -168,4 +168,4 @@ struct sdram_in_t { unsigned int option; }; -#endif /* __JZ4740_USBDEFINES__H_ */ +#endif /* __USB_BOOT_DEFINES_H__ */