From bb5f4be354d1a65fa066303da44887e335c12aaa Mon Sep 17 00:00:00 2001 From: xiangfu Date: Tue, 26 May 2009 17:14:40 +0000 Subject: [PATCH] change the hand point --- flash-tool/ingenic_cfg.c | 156 +++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/flash-tool/ingenic_cfg.c b/flash-tool/ingenic_cfg.c index eecf4f1..4840dd2 100644 --- a/flash-tool/ingenic_cfg.c +++ b/flash-tool/ingenic_cfg.c @@ -29,28 +29,28 @@ int hand_init_def(struct hand *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->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; + 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; } @@ -59,73 +59,73 @@ int check_dump_cfg(struct hand *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) { + 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) { + 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) { + 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 ) { + if (hand->fw_args.bus_width > 1 ) { printf("\n SDRAMWIDTH setting invalid!"); return 0; } - if ((*hand).fw_args.bank_num > 1 ) { + 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 ) { + 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 ) { + 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 ) { + 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 ) { + 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 ) { + 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 ) { + 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(" 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); + 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)); + 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); + hand->nand_ps,hand->nand_eccpos); - printf("bad block ID %d, ",(*hand).nand_bbpage); + printf("bad block ID %d, ",hand->nand_bbpage); - printf("use %d plane mode",(*hand).nand_plane); */ + printf("use %d plane mode",hand->nand_plane); */ printf("\n"); return 1; @@ -136,37 +136,37 @@ int parse_configure(struct hand *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("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("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("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_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() }; @@ -177,18 +177,18 @@ int parse_configure(struct hand *hand, char * file_path) return -1; cfg_free(cfg); - (*hand).fw_args.cpu_id = 0x4740; - if ((*hand).fw_args.bus_width == 32) - (*hand).fw_args.bus_width = 0 ; + 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; + 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); + (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;