aboutsummaryrefslogtreecommitdiffstats
path: root/tools/firmware-utils
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-08-22 09:22:38 +0000
committerJohn Crispin <john@openwrt.org>2012-08-22 09:22:38 +0000
commit6c9d20d6e7595b67aed95b23847c8f23ac89f192 (patch)
treed17bf56d0e2fb3bb014d04d0bb215a7c17f171b7 /tools/firmware-utils
parent60e6fcd31b4e5c30af3410aea9680b3379913bc0 (diff)
downloadupstream-6c9d20d6e7595b67aed95b23847c8f23ac89f192.tar.gz
upstream-6c9d20d6e7595b67aed95b23847c8f23ac89f192.tar.bz2
upstream-6c9d20d6e7595b67aed95b23847c8f23ac89f192.zip
tools/firmware-utils/ptgen option to use MB rounding
SVN-Revision: 33218
Diffstat (limited to 'tools/firmware-utils')
-rw-r--r--tools/firmware-utils/src/ptgen.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c
index d94aabb5fc..0247fd0131 100644
--- a/tools/firmware-utils/src/ptgen.c
+++ b/tools/firmware-utils/src/ptgen.c
@@ -56,6 +56,7 @@ int verbose = 0;
int active = 1;
int heads = -1;
int sectors = -1;
+int kb_align = 0;
struct partinfo parts[4];
char *filename = NULL;
@@ -117,6 +118,11 @@ static inline unsigned long round_to_cyl(long sect) {
return sect + cyl_size - (sect % cyl_size);
}
+/* round the sector number up to the kb_align boundary */
+static inline unsigned long round_to_kb(long sect) {
+ return ((sect - 1) / kb_align + 1) * kb_align;
+}
+
/* check the partition sizes and write the partition table */
static int gen_ptable(int nr)
{
@@ -132,8 +138,13 @@ static int gen_ptable(int nr)
}
pte[i].active = ((i + 1) == active) ? 0x80 : 0;
pte[i].type = parts[i].type;
- pte[i].start = cpu_to_le16(start = sect + sectors);
- sect = round_to_cyl(start + parts[i].size * 2);
+ start = sect + sectors;
+ if (kb_align != 0)
+ start = round_to_kb(start);
+ pte[i].start = cpu_to_le16(start);
+ sect = start + parts[i].size * 2;
+ if (kb_align == 0)
+ sect = round_to_cyl(sect);
pte[i].length = cpu_to_le16(len = sect - start);
to_chs(start, pte[i].chs_start);
to_chs(start + len - 1, pte[i].chs_end);
@@ -167,7 +178,7 @@ fail:
static void usage(char *prog)
{
- fprintf(stderr, "Usage: %s [-v] -h <heads> -s <sectors> -o <outputfile> [-a 0..4] [[-t <type>] -p <size>...] \n", prog);
+ fprintf(stderr, "Usage: %s [-v] -h <heads> -s <sectors> -o <outputfile> [-a 0..4] [-l <align kB>] [[-t <type>] -p <size>...] \n", prog);
exit(1);
}
@@ -177,7 +188,7 @@ int main (int argc, char **argv)
int ch;
int part = 0;
- while ((ch = getopt(argc, argv, "h:s:p:a:t:o:v")) != -1) {
+ while ((ch = getopt(argc, argv, "h:s:p:a:t:o:vl:")) != -1) {
switch (ch) {
case 'o':
filename = optarg;
@@ -207,6 +218,9 @@ int main (int argc, char **argv)
if ((active < 0) || (active > 4))
active = 0;
break;
+ case 'l':
+ kb_align = (int) strtoul(optarg, NULL, 0) * 2;
+ break;
case '?':
default:
usage(argv[0]);