int mtdparts_init(void);
int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num);
int find_dev_and_part(const char *id, struct mtd_device **dev,
- u8 *part_num, struct part_info **part);
+ u8 *part_num, struct part_info **part);
#endif
#ifdef CONFIG_MTD_NOR_FLASH
* or an invalid flash bank.
*/
static int
-abbrev_spec (char *str, flash_info_t ** pinfo, int *psf, int *psl)
+abbrev_spec(char *str, flash_info_t **pinfo, int *psf, int *psl)
{
flash_info_t *fp;
int bank, first, last;
char *p, *ep;
- if ((p = strchr (str, ':')) == NULL)
+ p = strchr(str, ':');
+ if (!p)
return 0;
*p++ = '\0';
bank = dectoul(str, &ep);
if (ep == str || *ep != '\0' ||
- bank < 1 || bank > CONFIG_SYS_MAX_FLASH_BANKS ||
- (fp = &flash_info[bank - 1])->flash_id == FLASH_UNKNOWN)
+ bank < 1 || bank > CONFIG_SYS_MAX_FLASH_BANKS)
+ return -1;
+
+ fp = &flash_info[bank - 1];
+ if (fp->flash_id == FLASH_UNKNOWN)
return -1;
str = p;
- if ((p = strchr (str, '-')) != NULL)
+ p = strchr(str, '-');
+ if (p)
*p++ = '\0';
first = dectoul(str, &ep);
if (ep == str || *ep != '\0' || first >= fp->sector_count)
return -1;
- if (p != NULL) {
+ if (p) {
last = dectoul(p, &ep);
if (ep == p || *ep != '\0' ||
- last < first || last >= fp->sector_count)
+ last < first || last >= fp->sector_count)
return -1;
} else {
last = first;
sector_end_addr = info->start[0] +
info->size - 1;
} else {
- sector_end_addr = info->start[i+1] - 1;
+ sector_end_addr = info->start[i + 1] - 1;
}
- if (*addr <= sector_end_addr &&
- *addr >= info->start[i]) {
+ if (*addr <= sector_end_addr && *addr >= info->start[i]) {
found = 1;
/* adjust *addr if necessary */
if (*addr < sector_end_addr)
* Return:
* 1: success
* -1: failure (bad format, bad address).
-*/
+ */
static int
addr_spec(char *arg1, char *arg2, ulong *addr_first, ulong *addr_last)
{
return -1;
len_used = 0;
- if (arg2 && *arg2 == '+'){
+ if (arg2 && *arg2 == '+') {
len_used = 1;
++arg2;
}
if (ep == arg2 || *ep != '\0')
return -1;
- if (len_used){
+ if (len_used) {
/*
* *addr_last has the length, compute correct *addr_last
* XXX watch out for the integer overflow! Right now it is
}
static int
-flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
- int *s_first, int *s_last,
- int *s_count )
+flash_fill_sect_ranges(ulong addr_first, ulong addr_last,
+ int *s_first, int *s_last,
+ int *s_count)
{
flash_info_t *info;
ulong bank;
*s_count = 0;
- for (bank=0; bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
+ for (bank = 0; bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
s_first[bank] = -1; /* first sector to erase */
- s_last [bank] = -1; /* last sector to erase */
+ s_last[bank] = -1; /* last sector to erase */
}
- for (bank=0,info = &flash_info[0];
+ for (bank = 0, info = &flash_info[0];
(bank < CONFIG_SYS_MAX_FLASH_BANKS) && (addr_first <= addr_last);
++bank, ++info) {
ulong b_end;
int sect;
short s_end;
- if (info->flash_id == FLASH_UNKNOWN) {
+ if (info->flash_id == FLASH_UNKNOWN)
continue;
- }
b_end = info->start[0] + info->size - 1; /* bank end addr */
s_end = info->sector_count - 1; /* last sector */
-
- for (sect=0; sect < info->sector_count; ++sect) {
+ for (sect = 0; sect < info->sector_count; ++sect) {
ulong end; /* last address in current sect */
end = (sect == s_end) ? b_end : info->start[sect + 1] - 1;
if (addr_last < info->start[sect])
continue;
- if (addr_first == info->start[sect]) {
+ if (addr_first == info->start[sect])
s_first[bank] = sect;
- }
- if (addr_last == end) {
+
+ if (addr_last == end)
s_last[bank] = sect;
- }
}
if (s_first[bank] >= 0) {
if (s_last[bank] < 0) {
if (addr_last > b_end) {
s_last[bank] = s_end;
} else {
- puts ("Error: end address"
- " not on sector boundary\n");
+ puts("Error: end address not on sector boundary\n");
rcode = 1;
break;
}
}
if (s_last[bank] < s_first[bank]) {
- puts ("Error: end sector"
- " precedes start sector\n");
+ puts("Error: end sector precedes start sector\n");
rcode = 1;
break;
}
sect = s_last[bank];
- addr_first = (sect == s_end) ? b_end + 1: info->start[sect + 1];
+ addr_first = (sect == s_end) ? b_end + 1 : info->start[sect + 1];
(*s_count) += s_last[bank] - s_first[bank] + 1;
} else if (addr_first >= info->start[0] && addr_first < b_end) {
- puts ("Error: start address not on sector boundary\n");
+ puts("Error: start address not on sector boundary\n");
rcode = 1;
break;
} else if (s_last[bank] >= 0) {
- puts ("Error: cannot span across banks when they are"
- " mapped in reverse order\n");
+ puts("Error: cannot span across banks when they are"
+ " mapped in reverse order\n");
rcode = 1;
break;
}
#ifdef CONFIG_MTD_NOR_FLASH
if (argc == 1) { /* print info for all FLASH banks */
- for (bank=0; bank <CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
- printf ("\nBank # %ld: ", bank+1);
+ for (bank = 0; bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
+ printf("\nBank # %ld: ", bank + 1);
flash_print_info(&flash_info[bank]);
}
}
bank = hextoul(argv[1], NULL);
- if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
- printf ("Only FLASH Banks # 1 ... # %d supported\n",
- CONFIG_SYS_MAX_FLASH_BANKS);
+ if (bank < 1 || bank > CONFIG_SYS_MAX_FLASH_BANKS) {
+ printf("Only FLASH Banks # 1 ... # %d supported\n",
+ CONFIG_SYS_MAX_FLASH_BANKS);
return 1;
}
- printf ("\nBank # %ld: ", bank);
+ printf("\nBank # %ld: ", bank);
flash_print_info(&flash_info[bank - 1]);
#endif /* CONFIG_MTD_NOR_FLASH */
return 0;
return CMD_RET_USAGE;
if (strcmp(argv[1], "all") == 0) {
- for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
- printf ("Erase Flash Bank # %ld ", bank);
- info = &flash_info[bank-1];
+ for (bank = 1; bank <= CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
+ printf("Erase Flash Bank # %ld ", bank);
+ info = &flash_info[bank - 1];
rcode = flash_erase(info, 0, info->sector_count - 1);
}
return rcode;
}
- if ((n = abbrev_spec(argv[1], &info, §_first, §_last)) != 0) {
+ n = abbrev_spec(argv[1], &info, §_first, §_last);
+ if (n) {
if (n < 0) {
- puts ("Bad sector specification\n");
+ puts("Bad sector specification\n");
return 1;
}
- printf ("Erase Flash Sectors %d-%d in Bank # %zu ",
- sect_first, sect_last, (info-flash_info)+1);
+ printf("Erase Flash Sectors %d-%d in Bank # %zu ",
+ sect_first, sect_last, (info - flash_info) + 1);
rcode = flash_erase(info, sect_first, sect_last);
return rcode;
}
#if defined(CONFIG_CMD_MTDPARTS)
/* erase <part-id> - erase partition */
- if ((argc == 2) && (mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0)) {
+ if (argc == 2 && mtd_id_parse(argv[1], NULL, &dev_type, &dev_num) == 0) {
mtdparts_init();
if (find_dev_and_part(argv[1], &dev, &pnum, &part) == 0) {
if (dev->id->type == MTD_DEV_TYPE_NOR) {
addr_first = part->offset + info->start[0];
addr_last = addr_first + part->size - 1;
- printf ("Erase Flash Partition %s, "
- "bank %ld, 0x%08lx - 0x%08lx ",
- argv[1], bank, addr_first,
- addr_last);
+ printf("Erase Flash Partition %s, bank %ld, 0x%08lx - 0x%08lx ",
+ argv[1], bank, addr_first,
+ addr_last);
rcode = flash_sect_erase(addr_first, addr_last);
return rcode;
if (strcmp(argv[1], "bank") == 0) {
bank = hextoul(argv[2], NULL);
- if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
- printf ("Only FLASH Banks # 1 ... # %d supported\n",
- CONFIG_SYS_MAX_FLASH_BANKS);
+ if (bank < 1 || bank > CONFIG_SYS_MAX_FLASH_BANKS) {
+ printf("Only FLASH Banks # 1 ... # %d supported\n",
+ CONFIG_SYS_MAX_FLASH_BANKS);
return 1;
}
- printf ("Erase Flash Bank # %ld ", bank);
- info = &flash_info[bank-1];
+ printf("Erase Flash Bank # %ld ", bank);
+ info = &flash_info[bank - 1];
rcode = flash_erase(info, 0, info->sector_count - 1);
return rcode;
}
- if (addr_spec(argv[1], argv[2], &addr_first, &addr_last) < 0){
- printf ("Bad address format\n");
+ if (addr_spec(argv[1], argv[2], &addr_first, &addr_last) < 0) {
+ printf("Bad address format\n");
return 1;
}
int planned;
int rcode = 0;
- rcode = flash_fill_sect_ranges (addr_first, addr_last,
- s_first, s_last, &planned );
+ rcode = flash_fill_sect_ranges(addr_first, addr_last, s_first, s_last, &planned);
- if (planned && (rcode == 0)) {
- for (bank=0,info = &flash_info[0];
- (bank < CONFIG_SYS_MAX_FLASH_BANKS) && (rcode == 0);
+ if (planned && rcode == 0) {
+ for (bank = 0, info = &flash_info[0];
+ bank < CONFIG_SYS_MAX_FLASH_BANKS && rcode == 0;
++bank, ++info) {
- if (s_first[bank]>=0) {
+ if (s_first[bank] >= 0) {
erased += s_last[bank] - s_first[bank] + 1;
debug("Erase Flash from 0x%08lx to 0x%08lx in Bank # %ld ",
info->start[s_first[bank]],
if (rcode == 0)
printf("Erased %d sectors\n", erased);
} else if (rcode == 0) {
- puts ("Error: start and/or end address"
- " not on sector boundary\n");
+ puts("Error: start and/or end address not on sector boundary\n");
rcode = 1;
}
return rcode;
#ifdef CONFIG_MTD_NOR_FLASH
if (strcmp(argv[2], "all") == 0) {
- for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
- info = &flash_info[bank-1];
- if (info->flash_id == FLASH_UNKNOWN) {
+ for (bank = 1; bank <= CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
+ info = &flash_info[bank - 1];
+ if (info->flash_id == FLASH_UNKNOWN)
continue;
- }
- printf ("%sProtect Flash Bank # %ld\n",
- p ? "" : "Un-", bank);
- for (i=0; i<info->sector_count; ++i) {
+ printf("%sProtect Flash Bank # %ld\n",
+ p ? "" : "Un-", bank);
+
+ for (i = 0; i < info->sector_count; ++i) {
#if defined(CONFIG_SYS_FLASH_PROTECTION)
if (flash_real_protect(info, i, p))
rcode = 1;
- putc ('.');
+ putc('.');
#else
info->protect[i] = p;
#endif /* CONFIG_SYS_FLASH_PROTECTION */
}
#if defined(CONFIG_SYS_FLASH_PROTECTION)
- if (!rcode) puts (" done\n");
+ if (!rcode)
+ puts(" done\n");
#endif /* CONFIG_SYS_FLASH_PROTECTION */
}
return rcode;
}
-
- if ((n = abbrev_spec(argv[2], &info, §_first, §_last)) != 0) {
+ n = abbrev_spec(argv[2], &info, §_first, §_last);
+ if (n) {
if (n < 0) {
- puts ("Bad sector specification\n");
+ puts("Bad sector specification\n");
return 1;
}
printf("%sProtect Flash Sectors %d-%d in Bank # %zu\n",
- p ? "" : "Un-", sect_first, sect_last,
- (info-flash_info)+1);
+ p ? "" : "Un-", sect_first, sect_last,
+ (info - flash_info) + 1);
for (i = sect_first; i <= sect_last; i++) {
#if defined(CONFIG_SYS_FLASH_PROTECTION)
if (flash_real_protect(info, i, p))
rcode = 1;
- putc ('.');
+ putc('.');
#else
info->protect[i] = p;
#endif /* CONFIG_SYS_FLASH_PROTECTION */
}
#if defined(CONFIG_SYS_FLASH_PROTECTION)
- if (!rcode) puts (" done\n");
+ if (!rcode)
+ puts(" done\n");
#endif /* CONFIG_SYS_FLASH_PROTECTION */
return rcode;
#if defined(CONFIG_CMD_MTDPARTS)
/* protect on/off <part-id> */
- if ((argc == 3) && (mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0)) {
+ if (argc == 3 && mtd_id_parse(argv[2], NULL, &dev_type, &dev_num) == 0) {
mtdparts_init();
if (find_dev_and_part(argv[2], &dev, &pnum, &part) == 0) {
if (dev->id->type == MTD_DEV_TYPE_NOR) {
addr_first = part->offset + info->start[0];
addr_last = addr_first + part->size - 1;
- printf ("%sProtect Flash Partition %s, "
- "bank %ld, 0x%08lx - 0x%08lx\n",
- p ? "" : "Un", argv[1],
- bank, addr_first, addr_last);
+ printf("%sProtect Flash Partition %s, "
+ "bank %ld, 0x%08lx - 0x%08lx\n",
+ p ? "" : "Un", argv[1],
+ bank, addr_first, addr_last);
rcode = flash_sect_protect(p, addr_first,
addr_last);
}
printf("cannot %sprotect, not a NOR device\n",
- p ? "" : "un");
+ p ? "" : "un");
return 1;
}
}
if (strcmp(argv[2], "bank") == 0) {
bank = hextoul(argv[3], NULL);
- if ((bank < 1) || (bank > CONFIG_SYS_MAX_FLASH_BANKS)) {
- printf ("Only FLASH Banks # 1 ... # %d supported\n",
- CONFIG_SYS_MAX_FLASH_BANKS);
+ if (bank < 1 || bank > CONFIG_SYS_MAX_FLASH_BANKS) {
+ printf("Only FLASH Banks # 1 ... # %d supported\n",
+ CONFIG_SYS_MAX_FLASH_BANKS);
return 1;
}
- printf ("%sProtect Flash Bank # %ld\n",
- p ? "" : "Un-", bank);
- info = &flash_info[bank-1];
+ printf("%sProtect Flash Bank # %ld\n",
+ p ? "" : "Un-", bank);
+ info = &flash_info[bank - 1];
if (info->flash_id == FLASH_UNKNOWN) {
- puts ("missing or unknown FLASH type\n");
+ puts("missing or unknown FLASH type\n");
return 1;
}
- for (i=0; i<info->sector_count; ++i) {
+ for (i = 0; i < info->sector_count; ++i) {
#if defined(CONFIG_SYS_FLASH_PROTECTION)
if (flash_real_protect(info, i, p))
rcode = 1;
- putc ('.');
+ putc('.');
#else
info->protect[i] = p;
#endif /* CONFIG_SYS_FLASH_PROTECTION */
}
#if defined(CONFIG_SYS_FLASH_PROTECTION)
- if (!rcode) puts (" done\n");
+ if (!rcode)
+ puts(" done\n");
#endif /* CONFIG_SYS_FLASH_PROTECTION */
return rcode;
}
- if (addr_spec(argv[2], argv[3], &addr_first, &addr_last) < 0){
+ if (addr_spec(argv[2], argv[3], &addr_first, &addr_last) < 0) {
printf("Bad address format\n");
return 1;
}
int planned;
int rcode;
- rcode = flash_fill_sect_ranges( addr_first, addr_last, s_first, s_last, &planned );
+ rcode = flash_fill_sect_ranges(addr_first, addr_last, s_first, s_last, &planned);
protected = 0;
- if (planned && (rcode == 0)) {
- for (bank=0,info = &flash_info[0]; bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank, ++info) {
- if (info->flash_id == FLASH_UNKNOWN) {
+ if (planned && rcode == 0) {
+ for (bank = 0, info = &flash_info[0];
+ bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank, ++info) {
+ if (info->flash_id == FLASH_UNKNOWN)
continue;
- }
- if (s_first[bank]>=0 && s_first[bank]<=s_last[bank]) {
+ if (s_first[bank] >= 0 && s_first[bank] <= s_last[bank]) {
debug("%sProtecting sectors %d..%d in bank %ld\n",
p ? "" : "Un-", s_first[bank],
s_last[bank], bank + 1);
protected += s_last[bank] - s_first[bank] + 1;
- for (i=s_first[bank]; i<=s_last[bank]; ++i) {
+ for (i = s_first[bank]; i <= s_last[bank]; ++i) {
#if defined(CONFIG_SYS_FLASH_PROTECTION)
if (flash_real_protect(info, i, p))
rcode = 1;
- putc ('.');
+ putc('.');
#else
info->protect[i] = p;
#endif /* CONFIG_SYS_FLASH_PROTECTION */
}
}
#if defined(CONFIG_SYS_FLASH_PROTECTION)
- puts (" done\n");
+ puts(" done\n");
#endif /* CONFIG_SYS_FLASH_PROTECTION */
- printf ("%sProtected %d sectors\n",
- p ? "" : "Un-", protected);
+ printf("%sProtected %d sectors\n",
+ p ? "" : "Un-", protected);
} else if (rcode == 0) {
- puts ("Error: start and/or end address"
- " not on sector boundary\n");
+ puts("Error: start and/or end address not on sector boundary\n");
rcode = 1;
}
return rcode;
}
#endif /* CONFIG_MTD_NOR_FLASH */
-
/**************************************************/
#if defined(CONFIG_CMD_MTDPARTS)
# define TMP_ERASE "erase <part-id>\n - erase partition\n"
"start end\n"
" - erase FLASH from addr 'start' to addr 'end'\n"
"erase start +len\n"
- " - erase FLASH from addr 'start' to the end of sect "
- "w/addr 'start'+'len'-1\n"
+ " - erase FLASH from addr 'start' to the end of sect w/addr 'start'+'len'-1\n"
"erase N:SF[-SL]\n - erase sectors SF-SL in FLASH bank # N\n"
"erase bank N\n - erase FLASH bank # N\n"
TMP_ERASE
"on start end\n"
" - protect FLASH from addr 'start' to addr 'end'\n"
"protect on start +len\n"
- " - protect FLASH from addr 'start' to end of sect "
- "w/addr 'start'+'len'-1\n"
+ " - protect FLASH from addr 'start' to end of sect w/addr 'start'+'len'-1\n"
"protect on N:SF[-SL]\n"
" - protect sectors SF-SL in FLASH bank # N\n"
"protect on bank N\n - protect FLASH bank # N\n"
"protect off start end\n"
" - make FLASH from addr 'start' to addr 'end' writable\n"
"protect off start +len\n"
- " - make FLASH from addr 'start' to end of sect "
- "w/addr 'start'+'len'-1 wrtable\n"
+ " - make FLASH from addr 'start' to end of sect w/addr 'start'+'len'-1 wrtable\n"
"protect off N:SF[-SL]\n"
" - make sectors SF-SL writable in FLASH bank # N\n"
"protect off bank N\n - make FLASH bank # N writable\n"
projects / platform / kernel / u-boot.git / commitdiff