X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=board%2Fkaro%2Ftx28%2Fflash.c;h=af9bb7285e3146c27262f11176574fe20b75416a;hp=376e6b480b1380db758045e9d85b332df9bb3b66;hb=88914836fa30e167183603974d5bd29dd04102bd;hpb=305de62a19ad59c5530d452e82fa75fa17c9c904 diff --git a/board/karo/tx28/flash.c b/board/karo/tx28/flash.c index 376e6b480b..af9bb7285e 100644 --- a/board/karo/tx28/flash.c +++ b/board/karo/tx28/flash.c @@ -1,19 +1,33 @@ +/* + * Copyright (C) 2011-2014 Lothar Waßmann + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 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. + * + */ + #include #include #include #include #include +#include #include -#include +#include #include -#include -#include - -#define FCB_START_BLOCK 0 -#define NUM_FCB_BLOCKS 1 -#define MAX_FCB_BLOCKS 32768 +#include +#include struct mx28_nand_timing { u8 data_setup; @@ -57,26 +71,10 @@ struct mx28_fcb { u32 bb_mark_phys_offset; }; -struct mx28_dbbt_header { - u32 checksum; - u32 fingerprint; - u32 version; - u32 number_bb; - u32 number_pages; - u8 spare[492]; -}; - -struct mx28_dbbt { - u32 nand_number; - u32 number_bb; - u32 bb_num[2040 / 4]; -}; - #define BF_VAL(v, bf) (((v) & bf##_MASK) >> bf##_OFFSET) static nand_info_t *mtd = &nand_info[0]; - -extern void *_start; +static bool doit; #define BIT(v,n) (((v) >> (n)) & 0x1) @@ -149,15 +147,45 @@ static int calc_bb_offset(nand_info_t *mtd, struct mx28_fcb *fcb) return bb_mark_offset; } +/* + * return number of blocks to skip for a contiguous partition + * of given # blocks + */ +static int find_contig_space(int block, int num_blocks, int max_blocks) +{ + int skip = 0; + int found = 0; + int last = block + max_blocks; + + debug("Searching %u contiguous blocks from %d..%d\n", + num_blocks, block, block + max_blocks - 1); + for (; block < last; block++) { + if (nand_block_isbad(mtd, block * mtd->erasesize)) { + skip += found + 1; + found = 0; + debug("Skipping %u blocks to %u\n", + skip, block + 1); + } else { + found++; + if (found >= num_blocks) { + debug("Found %u good blocks from %d..%d\n", + found, block - found + 1, block); + return skip; + } + } + } + return -ENOSPC; +} + +#define pr_fcb_val(p, n) debug("%s=%08x(%d)\n", #n, (p)->n, (p)->n) + static struct mx28_fcb *create_fcb(void *buf, int fw1_start_block, - int fw2_start_block, size_t fw_size) + int fw2_start_block, int fw_num_blocks) { - struct mx28_gpmi_regs *gpmi_base = - (struct mx28_gpmi_regs *)MXS_GPMI_BASE; - struct mx28_bch_regs *bch_base = - (struct mx28_bch_regs *)MXS_BCH_BASE; + struct gpmi_regs *gpmi_base = (void *)GPMI_BASE_ADDRESS; + struct bch_regs *bch_base = (void *)BCH_BASE_ADDRESS; u32 fl0, fl1; - u32 t0, t1; + u32 t0; int metadata_size; int bb_mark_bit_offs; struct mx28_fcb *fcb; @@ -170,7 +198,6 @@ static struct mx28_fcb *create_fcb(void *buf, int fw1_start_block, fl0 = readl(&bch_base->hw_bch_flash0layout0); fl1 = readl(&bch_base->hw_bch_flash0layout1); t0 = readl(&gpmi_base->hw_gpmi_timing0); - t1 = readl(&gpmi_base->hw_gpmi_timing1); metadata_size = BF_VAL(fl0, BCH_FLASHLAYOUT0_META_SIZE); @@ -184,9 +211,10 @@ static struct mx28_fcb *create_fcb(void *buf, int fw1_start_block, strncpy((char *)&fcb->fingerprint, "FCB ", 4); fcb->version = cpu_to_be32(1); - fcb->timing.data_setup = BF_VAL(t0, GPMI_TIMING0_DATA_SETUP); - fcb->timing.data_hold = BF_VAL(t0, GPMI_TIMING0_DATA_HOLD); - fcb->timing.address_setup = BF_VAL(t0, GPMI_TIMING0_ADDRESS_SETUP); + /* ROM code assumes GPMI clock of 25 MHz */ + fcb->timing.data_setup = BF_VAL(t0, GPMI_TIMING0_DATA_SETUP) * 40; + fcb->timing.data_hold = BF_VAL(t0, GPMI_TIMING0_DATA_HOLD) * 40; + fcb->timing.address_setup = BF_VAL(t0, GPMI_TIMING0_ADDRESS_SETUP) * 40; fcb->page_data_size = mtd->writesize; fcb->total_page_size = mtd->writesize + mtd->oobsize; @@ -197,19 +225,25 @@ static struct mx28_fcb *create_fcb(void *buf, int fw1_start_block, fcb->ecc_blockn_type = BF_VAL(fl1, BCH_FLASHLAYOUT1_ECCN); fcb->ecc_blockn_size = BF_VAL(fl1, BCH_FLASHLAYOUT1_DATAN_SIZE); + pr_fcb_val(fcb, ecc_block0_type); + pr_fcb_val(fcb, ecc_blockn_type); + pr_fcb_val(fcb, ecc_block0_size); + pr_fcb_val(fcb, ecc_blockn_size); + fcb->metadata_size = BF_VAL(fl0, BCH_FLASHLAYOUT0_META_SIZE); fcb->ecc_blocks_per_page = BF_VAL(fl0, BCH_FLASHLAYOUT0_NBLOCKS); fcb->bch_mode = readl(&bch_base->hw_bch_mode); -/* - fcb->boot_patch = 0; - fcb->patch_sectors = 0; -*/ - fcb->fw1_start_page = fw1_start_block * mtd->erasesize / mtd->writesize; - fcb->fw1_sectors = DIV_ROUND_UP(fw_size, mtd->writesize); + + fcb->fw1_start_page = fw1_start_block * fcb->sectors_per_block; + fcb->fw1_sectors = fw_num_blocks * fcb->sectors_per_block; + pr_fcb_val(fcb, fw1_start_page); + pr_fcb_val(fcb, fw1_sectors); if (fw2_start_block != 0 && fw2_start_block < mtd->size / mtd->erasesize) { - fcb->fw2_start_page = fw2_start_block * mtd->erasesize / mtd->writesize; + fcb->fw2_start_page = fw2_start_block * fcb->sectors_per_block; fcb->fw2_sectors = fcb->fw1_sectors; + pr_fcb_val(fcb, fw2_start_page); + pr_fcb_val(fcb, fw2_sectors); } fcb->dbbt_search_area = 1; @@ -221,6 +255,10 @@ static struct mx28_fcb *create_fcb(void *buf, int fw1_start_block, fcb->bb_mark_startbit = bb_mark_bit_offs % 8; fcb->bb_mark_phys_offset = mtd->writesize; + pr_fcb_val(fcb, bb_mark_byte); + pr_fcb_val(fcb, bb_mark_startbit); + pr_fcb_val(fcb, bb_mark_phys_offset); + fcb->checksum = calc_chksum(&fcb->fingerprint, 512 - 4); return fcb; } @@ -236,17 +274,18 @@ static int find_fcb(void *ref, int page) } chip->select_chip(mtd, 0); chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); - ret = chip->ecc.read_page_raw(mtd, chip, buf, page); + ret = chip->ecc.read_page_raw(mtd, chip, buf, 1, page); if (ret) { printf("Failed to read FCB from page %u: %d\n", page, ret); - return ret; + goto out; } - chip->select_chip(mtd, -1); if (memcmp(buf, ref, mtd->writesize) == 0) { - printf("%s: Found FCB in page %u (%08x)\n", __func__, + debug("Found FCB in page %u (%08x)\n", page, page * mtd->writesize); ret = 1; } +out: + chip->select_chip(mtd, -1); free(buf); return ret; } @@ -263,20 +302,25 @@ static int write_fcb(void *buf, int block) return 0; } - ret = nand_erase(mtd, block * mtd->erasesize, mtd->erasesize); - if (ret) { - printf("Failed to erase FCB block %u\n", block); - return ret; + if (doit) { + ret = nand_erase(mtd, block * mtd->erasesize, mtd->erasesize); + if (ret) { + printf("Failed to erase FCB block %u\n", block); + return ret; + } } - printf("Writing FCB to block %d @ %08x\n", block, - block * mtd->erasesize); - chip->select_chip(mtd, 0); - ret = chip->write_page(mtd, chip, buf, page, 0, 1); - if (ret) { - printf("Failed to write FCB to block %u: %d\n", block, ret); + printf("Writing FCB to block %d @ %08llx\n", block, + (u64)block * mtd->erasesize); + if (doit) { + chip->select_chip(mtd, 0); + ret = chip->write_page(mtd, chip, 0, mtd->writesize, + buf, 1, page, 0, 1); + if (ret) { + printf("Failed to write FCB to block %u: %d\n", block, ret); + } + chip->select_chip(mtd, -1); } - chip->select_chip(mtd, -1); return ret; } @@ -286,105 +330,141 @@ static int write_fcb(void *buf, int block) (b##_start_block <= a##_end_block && \ b##_end_block >= a##_start_block)) -#define fail_if_overlap(a,b,m1,m2) do { \ - if (chk_overlap(a, b)) { \ +#define fail_if_overlap(a,b,m1,m2) do { \ + if (!doit) \ + printf("check: %s[%lu..%lu] <> %s[%lu..%lu]\n", \ + m1, a##_start_block, a##_end_block, \ + m2, b##_start_block, b##_end_block); \ + if (a##_end_block < a##_start_block) \ + printf("Invalid start/end block # for %s\n", m1); \ + if (b##_end_block < b##_start_block) \ + printf("Invalid start/end block # for %s\n", m2); \ + if (chk_overlap(a, b)) { \ printf("%s blocks %lu..%lu overlap %s in blocks %lu..%lu!\n", \ - m1, a##_start_block, a##_end_block, \ - m2, b##_start_block, b##_end_block); \ - return -EINVAL; \ - } \ + m1, a##_start_block, a##_end_block, \ + m2, b##_start_block, b##_end_block); \ + return -EINVAL; \ + } \ } while (0) +static int tx28_prog_uboot(void *addr, int start_block, int skip, + size_t size, size_t max_len) +{ + int ret; + nand_erase_options_t erase_opts = { 0, }; + size_t actual; + size_t prg_length = max_len - skip * mtd->erasesize; + int prg_start = (start_block + skip) * mtd->erasesize; + + erase_opts.offset = start_block * mtd->erasesize; + erase_opts.length = max_len; + erase_opts.quiet = 1; + + printf("Erasing flash @ %08llx..%08llx\n", erase_opts.offset, + erase_opts.offset + erase_opts.length - 1); + if (doit) { + ret = nand_erase_opts(mtd, &erase_opts); + if (ret) { + printf("Failed to erase flash: %d\n", ret); + return ret; + } + } + + printf("Programming flash @ %08x..%08x from %p\n", + prg_start, prg_start + size - 1, addr); + if (doit) { + actual = size; + ret = nand_write_skip_bad(mtd, prg_start, &actual, NULL, + prg_length, addr, 0); + if (ret) { + printf("Failed to program flash: %d\n", ret); + return ret; + } + if (actual < size) { + printf("Could only write %u of %u bytes\n", actual, size); + return -EIO; + } + } + return 0; +} + +#ifdef CONFIG_ENV_IS_IN_NAND #ifndef CONFIG_ENV_OFFSET_REDUND -#define TOTAL_ENV_SIZE CONFIG_ENV_SIZE +#define TOTAL_ENV_SIZE CONFIG_ENV_RANGE #else -#define TOTAL_ENV_SIZE (CONFIG_ENV_SIZE * 2) +#define TOTAL_ENV_SIZE (CONFIG_ENV_RANGE * 2) +#endif #endif -int do_update(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_update(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { int ret; - int block; + const unsigned long fcb_start_block = 0, fcb_end_block = 0; int erase_size = mtd->erasesize; - int page_size = mtd->writesize; void *buf; char *load_addr; char *file_size; size_t size = 0; void *addr = NULL; struct mx28_fcb *fcb; - unsigned long fcb_start_block = FCB_START_BLOCK; - unsigned long num_fcb_blocks = NUM_FCB_BLOCKS; - unsigned long fcb_end_block; - unsigned long mtd_num_blocks = mtd->size / mtd->erasesize; + unsigned long mtd_num_blocks = lldiv(mtd->size, mtd->erasesize); +#ifdef CONFIG_ENV_IS_IN_NAND unsigned long env_start_block = CONFIG_ENV_OFFSET / mtd->erasesize; unsigned long env_end_block = env_start_block + DIV_ROUND_UP(TOTAL_ENV_SIZE, mtd->erasesize) - 1; +#endif int optind; - int fw1_set = 0; int fw2_set = 0; unsigned long fw1_start_block = 0, fw1_end_block; unsigned long fw2_start_block = 0, fw2_end_block; unsigned long fw_num_blocks; - unsigned long extra_blocks = 2; - nand_erase_options_t erase_opts = { 0, }; - int fcb_written = 0; - - load_addr = getenv("fileaddr"); - file_size = getenv("filesize"); - - if (argc < 2 && load_addr == NULL) { - printf("Load address not specified\n"); - return -EINVAL; - } - if (argc < 3 && file_size == NULL) { - printf("Image size not specified\n"); - return -EINVAL; - } + int fw1_skip, fw2_skip; + unsigned long extra_blocks = 0; + u64 max_len1, max_len2; + struct mtd_device *dev; + struct part_info *part_info; + struct part_info *redund_part_info; + const char *uboot_part = "u-boot"; + const char *redund_part = NULL; + u8 part_num; + u8 redund_part_num; + + ret = mtdparts_init(); + if (ret) + return ret; + doit = true; for (optind = 1; optind < argc; optind++) { - if (strcmp(argv[optind], "-b") == 0) { - if (optind >= argc - 1) { - printf("Option %s requires an argument\n", argv[optind]); - return -EINVAL; - } - optind++; - fcb_start_block = simple_strtoul(argv[optind], NULL, 0); - if (fcb_start_block >= mtd_num_blocks) { - printf("Block number %lu is out of range: 0..%lu\n", - fcb_start_block, mtd_num_blocks - 1); - return -EINVAL; - } - } else if (strcmp(argv[optind], "-n") == 0) { + char *endp; + + if (strcmp(argv[optind], "-f") == 0) { if (optind >= argc - 1) { - printf("Option %s requires an argument\n", argv[optind]); + printf("Option %s requires an argument\n", + argv[optind]); return -EINVAL; } optind++; - num_fcb_blocks = simple_strtoul(argv[optind], NULL, 0); - if (num_fcb_blocks > MAX_FCB_BLOCKS) { - printf("Extraneous number of FCB blocks; max. allowed: %u\n", - MAX_FCB_BLOCKS); - return -EINVAL; - } - } else if (strcmp(argv[optind], "-f") == 0) { - if (optind >= argc - 1) { - printf("Option %s requires an argument\n", argv[optind]); - return -EINVAL; + fw1_start_block = simple_strtoul(argv[optind], &endp, 0); + if (*endp != '\0') { + uboot_part = argv[optind]; + continue; } - optind++; - fw1_start_block = simple_strtoul(argv[optind], NULL, 0); + uboot_part = NULL; if (fw1_start_block >= mtd_num_blocks) { printf("Block number %lu is out of range: 0..%lu\n", - fw1_start_block, - mtd_num_blocks - 1); + fw1_start_block, mtd_num_blocks - 1); return -EINVAL; } - fw1_set = 1; } else if (strcmp(argv[optind], "-r") == 0) { + fw2_set = 1; if (optind < argc - 1 && argv[optind + 1][0] != '-') { optind++; - fw2_start_block = simple_strtoul(argv[optind], NULL, 0); + fw2_start_block = simple_strtoul(argv[optind], + &endp, 0); + if (*endp != '\0') { + redund_part = argv[optind]; + continue; + } if (fw2_start_block >= mtd_num_blocks) { printf("Block number %lu is out of range: 0..%lu\n", fw2_start_block, @@ -392,10 +472,10 @@ int do_update(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return -EINVAL; } } - fw2_set = 1; } else if (strcmp(argv[optind], "-e") == 0) { if (optind >= argc - 1) { - printf("Option %s requires an argument\n", argv[optind]); + printf("Option %s requires an argument\n", + argv[optind]); return -EINVAL; } optind++; @@ -406,19 +486,41 @@ int do_update(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) mtd_num_blocks - 1); return -EINVAL; } + } else if (strcmp(argv[optind], "-n") == 0) { + doit = false; } else if (argv[optind][0] == '-') { printf("Unrecognized option %s\n", argv[optind]); return -EINVAL; + } else { + break; + } + } + + load_addr = getenv("fileaddr"); + file_size = getenv("filesize"); + + if (argc - optind < 1 && load_addr == NULL) { + printf("Load address not specified\n"); + return -EINVAL; + } + if (argc - optind < 2 && file_size == NULL) { + if (uboot_part) { + printf("WARNING: Image size not specified; overwriting whole '%s' partition\n", + uboot_part); + printf("This will only work, if there are no bad blocks inside this partition!\n"); + } else { + printf("ERROR: Image size must be specified\n"); + return -EINVAL; } } if (argc > optind) { load_addr = NULL; - addr = (void *)simple_strtoul(argv[optind], NULL, 0); + addr = (void *)simple_strtoul(argv[optind], NULL, 16); optind++; } if (argc > optind) { file_size = NULL; - size = simple_strtoul(argv[optind], NULL, 0); + size = simple_strtoul(argv[optind], NULL, 16); optind++; } if (load_addr != NULL) { @@ -429,164 +531,166 @@ int do_update(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) size = simple_strtoul(file_size, NULL, 16); printf("Using default file size %08x\n", size); } - fcb_end_block = fcb_start_block + num_fcb_blocks - 1; - fw_num_blocks = DIV_ROUND_UP(size, mtd->erasesize); + if (size > 0) + fw_num_blocks = DIV_ROUND_UP(size, mtd->erasesize); + else + fw_num_blocks = 0; - if (!fw1_set) { - fw1_start_block = fcb_end_block + 1; - fw1_end_block = fw1_start_block + fw_num_blocks + extra_blocks - 1; - if (chk_overlap(fw1, env)) { - fw1_start_block = env_end_block + 1; - fw1_end_block = fw1_start_block + fw_num_blocks + extra_blocks - 1; + if (uboot_part) { + ret = find_dev_and_part(uboot_part, &dev, &part_num, + &part_info); + if (ret) { + printf("Failed to find '%s' partition: %d\n", + uboot_part, ret); + return ret; } + fw1_start_block = lldiv(part_info->offset, mtd->erasesize); + max_len1 = part_info->size; + if (size == 0) + fw_num_blocks = lldiv(max_len1, mtd->erasesize); } else { - fw1_end_block = fw1_start_block + fw_num_blocks + extra_blocks - 1; + max_len1 = (u64)(fw_num_blocks + extra_blocks) * mtd->erasesize; } - if (fw2_set && fw2_start_block == 0) { + if (redund_part) { + ret = find_dev_and_part(redund_part, &dev, &redund_part_num, + &redund_part_info); + if (ret) { + printf("Failed to find '%s' partition: %d\n", + redund_part, ret); + return ret; + } + fw2_start_block = lldiv(redund_part_info->offset, mtd->erasesize); + max_len2 = redund_part_info->size; + if (fw2_start_block == fcb_start_block) { + fw2_start_block++; + max_len2 -= mtd->erasesize; + } + if (size == 0) + fw_num_blocks = lldiv(max_len2, mtd->erasesize); + } else if (fw2_set) { + max_len2 = (u64)(fw_num_blocks + extra_blocks) * mtd->erasesize; + } else { + max_len2 = 0; + } + + fw1_skip = find_contig_space(fw1_start_block, fw_num_blocks, + lldiv(max_len1, mtd->erasesize)); + if (fw1_skip < 0) { + printf("Could not find %lu contiguous good blocks for fw image in blocks %lu..%llu\n", + fw_num_blocks, fw1_start_block, + fw1_start_block + lldiv(max_len1, mtd->erasesize) - 1); + if (uboot_part) { +#ifdef CONFIG_ENV_IS_IN_NAND + if (part_info->offset <= CONFIG_ENV_OFFSET + TOTAL_ENV_SIZE) { + printf("Use a different partition\n"); + } else { + printf("Increase the size of the '%s' partition\n", + uboot_part); + } +#else + printf("Increase the size of the '%s' partition\n", + uboot_part); +#endif + } else { + printf("Increase the number of spare blocks to use with the '-e' option\n"); + } + return -ENOSPC; + } + if (extra_blocks) + fw1_end_block = fw1_start_block + fw_num_blocks + extra_blocks - 1; + else + fw1_end_block = fw1_start_block + fw_num_blocks + fw1_skip - 1; + + if (fw2_set && fw2_start_block == 0) fw2_start_block = fw1_end_block + 1; - fw2_end_block = fw2_start_block + fw_num_blocks + extra_blocks - 1; - if (chk_overlap(fw2, env)) { - fw2_start_block = env_end_block + 1; - fw2_end_block = fw2_start_block + fw_num_blocks + extra_blocks - 1; + if (fw2_start_block > 0) { + fw2_skip = find_contig_space(fw2_start_block, fw_num_blocks, + lldiv(max_len2, mtd->erasesize)); + if (fw2_skip < 0) { + printf("Could not find %lu contiguous good blocks for redundant fw image in blocks %lu..%llu\n", + fw_num_blocks, fw2_start_block, + fw2_start_block + lldiv(max_len2, mtd->erasesize) - 1); + if (redund_part) { + printf("Increase the size of the '%s' partition or use a different partition\n", + redund_part); + } else { + printf("Increase the number of spare blocks to use with the '-e' option\n"); + } + return -ENOSPC; } } else { - fw2_end_block = fw2_start_block + fw_num_blocks + extra_blocks - 1; + fw2_skip = 0; } + if (extra_blocks) + fw2_end_block = fw2_start_block + fw_num_blocks + extra_blocks - 1; + else + fw2_end_block = fw2_start_block + fw_num_blocks + fw2_skip - 1; +#ifdef CONFIG_ENV_IS_IN_NAND fail_if_overlap(fcb, env, "FCB", "Environment"); - fail_if_overlap(fcb, fw1, "FCB", "FW1"); fail_if_overlap(fw1, env, "FW1", "Environment"); +#endif + fail_if_overlap(fcb, fw1, "FCB", "FW1"); if (fw2_set) { fail_if_overlap(fcb, fw2, "FCB", "FW2"); +#ifdef CONFIG_ENV_IS_IN_NAND fail_if_overlap(fw2, env, "FW2", "Environment"); +#endif fail_if_overlap(fw1, fw2, "FW1", "FW2"); } + fw1_start_block += fw1_skip; + fw2_start_block += fw2_skip; - buf = malloc(erase_size); + buf = memalign(SZ_128K, erase_size); if (buf == NULL) { printf("Failed to allocate buffer\n"); return -ENOMEM; } - /* search for first non-bad block in FW1 block range */ - while (fw1_start_block <= fw1_end_block) { - if (!nand_block_isbad(mtd, fw1_start_block * mtd->erasesize)) - break; - fw1_start_block++; - } - if (fw1_end_block - fw1_start_block + 1 < fw_num_blocks) { - printf("Too many bad blocks in FW1 block range: %lu..%lu\n", - fw1_end_block + 1 - fw_num_blocks - extra_blocks, - fw1_end_block); - return -EINVAL; - } - /* search for first non-bad block in FW2 block range */ - while (fw2_set && fw2_start_block <= fw2_end_block) { - if (!nand_block_isbad(mtd, fw2_start_block * mtd->erasesize)) - break; - fw2_start_block++; - } - if (fw2_end_block - fw2_start_block + 1 < fw_num_blocks) { - printf("Too many bad blocks in FW2 area %08lx..%08lx\n", - fw2_end_block + 1 - fw_num_blocks - extra_blocks, - fw2_end_block); - return -EINVAL; - } - - fcb = create_fcb(buf, fw1_start_block, fw2_start_block, - (fw_num_blocks + extra_blocks) * mtd->erasesize); + fcb = create_fcb(buf, fw1_start_block, + fw2_start_block, fw_num_blocks); if (IS_ERR(fcb)) { printf("Failed to initialize FCB: %ld\n", PTR_ERR(fcb)); - return PTR_ERR(fcb); + ret = PTR_ERR(fcb); + goto out; } encode_hamming_13_8(fcb, (void *)fcb + 512, 512); - for (block = fcb_start_block; block < fcb_start_block + num_fcb_blocks; - block++) { - if (nand_block_isbad(mtd, block * mtd->erasesize)) { - if (block == fcb_start_block) - fcb_start_block++; - continue; - } - ret = write_fcb(buf, block); - if (ret) { - printf("Failed to write FCB to block %u\n", block); - return ret; - } - fcb_written = 1; - } - - if (!fcb_written) { - printf("Could not write FCB to flash\n"); - return -EIO; - } - - printf("Programming U-Boot image from %p to block %lu\n", - addr, fw1_start_block); - if (size & (page_size - 1)) { - memset(addr + size, 0xff, size & (page_size - 1)); - size = ALIGN(size, page_size); - } - - erase_opts.offset = fcb->fw1_start_page * page_size; - erase_opts.length = ALIGN(size, erase_size) + - extra_blocks * mtd->erasesize; - erase_opts.quiet = 1; - - printf("Erasing flash @ %08llx..%08llx\n", erase_opts.offset, - erase_opts.offset + erase_opts.length - 1); - - ret = nand_erase_opts(mtd, &erase_opts); + ret = write_fcb(buf, fcb_start_block); if (ret) { - printf("Failed to erase flash: %d\n", ret); - return ret; - } - printf("Programming flash @ %08x..%08x from %p\n", - fcb->fw1_start_page * page_size, - fcb->fw1_start_page * page_size + size, addr); - ret = nand_write_skip_bad(mtd, fcb->fw1_start_page * page_size, - &size, addr, WITH_DROP_FFS); - if (ret) { - printf("Failed to program flash: %d\n", ret); - return ret; - } - if (fw2_start_block == 0) { + printf("Failed to write FCB to block %lu\n", fcb_start_block); return ret; } - printf("Programming redundant U-Boot image to block %lu\n", - fw2_start_block); - erase_opts.offset = fcb->fw2_start_page * page_size; - printf("Erasing flash @ %08llx..%08llx\n", erase_opts.offset, - erase_opts.offset + erase_opts.length - 1); + printf("Programming U-Boot image from %p to block %lu @ %08llx\n", + addr, fw1_start_block, (u64)fw1_start_block * mtd->erasesize); + ret = tx28_prog_uboot(addr, fw1_start_block, fw1_skip, size, + max_len1); - ret = nand_erase_opts(mtd, &erase_opts); - if (ret) { - printf("Failed to erase flash: %d\n", ret); - return ret; - } - printf("Programming flash @ %08x..%08x from %p\n", - fcb->fw2_start_page * page_size, - fcb->fw2_start_page * page_size + size, addr); - ret = nand_write_skip_bad(mtd, fcb->fw2_start_page * page_size, - &size, addr, WITH_DROP_FFS); - if (ret) { - printf("Failed to program flash: %d\n", ret); - return ret; - } + if (ret || fw2_start_block == 0) + goto out; + + printf("Programming redundant U-Boot image to block %lu @ %08llx\n", + fw2_start_block, (u64)fw2_start_block * mtd->erasesize); + ret = tx28_prog_uboot(addr, fw2_start_block, fw2_skip, fw_num_blocks, + max_len2); +out: + free(buf); return ret; } U_BOOT_CMD(romupdate, 11, 0, do_update, - "Creates an FCB data structure and writes an U-Boot image to flash\n", - "[-b #] [-n #] [-f #] [-r [#]] [
] []\n" - "\t-b #\tfirst FCB block number (default 0)\n" - "\t-n #\ttotal number of FCB blocks (default 1)\n" - "\t-f #\twrite bootloader image at block #\n" - "\t-r\twrite redundant bootloader image at next free block after first image\n" - "\t-r #\twrite redundant bootloader image at block #\n" - "\t-e #\tspecify number of redundant blocks per boot loader image\n" - "\t
\tRAM address of bootloader image (default: ${fileaddr}\n" - "\t\tlength of bootloader image in RAM (default: ${filesize}" + "Creates an FCB data structure and writes an U-Boot image to flash", + "[-f {|block#}] [-r [{|block#}]] [-e #] [
] []\n" + "\t-f \twrite bootloader image to partition \n" + "\t-f #\t\twrite bootloader image at block # (decimal)\n" + "\t-r\t\twrite redundant bootloader image at next free block after first image\n" + "\t-r \twrite redundant bootloader image to partition \n" + "\t-r #\t\twrite redundant bootloader image at block # (decimal)\n" + "\t-e #\t\tspecify number of redundant blocks per boot loader image\n" + "\t\t\t(only valid if -f or -r specify a flash address rather than a partition name)\n" + "\t-n\t\tshow what would be done without actually updating the flash\n" + "\t
\tRAM address of bootloader image (default: ${fileaddr})\n" + "\t\tlength of bootloader image in RAM (default: ${filesize})" );