summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/sbtools/elftosb.c115
-rw-r--r--utils/sbtools/sb.h1
-rw-r--r--utils/sbtools/sbtoelf.c25
3 files changed, 126 insertions, 15 deletions
diff --git a/utils/sbtools/elftosb.c b/utils/sbtools/elftosb.c
index 601321d9c0..78d2e80bf9 100644
--- a/utils/sbtools/elftosb.c
+++ b/utils/sbtools/elftosb.c
@@ -221,6 +221,8 @@ struct cmd_section_t
struct cmd_file_t
{
+ struct sb_version_t product_ver;
+ struct sb_version_t component_ver;
struct cmd_source_t *source_list;
struct cmd_section_t *section_list;
};
@@ -449,6 +451,50 @@ static struct cmd_source_t *find_source_by_id(struct cmd_file_t *cmd_file, const
return NULL;
}
+static void generate_default_version(struct sb_version_t *ver)
+{
+ ver->major = 0x999;
+ ver->minor = 0x999;
+ ver->revision = 0x999;
+}
+
+static uint16_t parse_sb_subversion(char *str)
+{
+ int len = strlen(str);
+ uint16_t n = 0;
+ if(len == 0 || len > 4)
+ bug("invalid command file: invalid version string");
+ for(int i = 0; i < len; i++)
+ {
+ if(!isdigit(str[i]))
+ bug("invalid command file: invalid version string");
+ n = n << 4 | (str[i] - '0');
+ }
+ return n;
+}
+
+static void parse_sb_version(struct sb_version_t *ver, char *str)
+{
+ int len = strlen(str);
+ int cnt = 0;
+ int pos[2];
+
+ for(int i = 0; i < len; i++)
+ {
+ if(str[i] != '.')
+ continue;
+ if(cnt == 2)
+ bug("invalid command file: invalid version string");
+ pos[cnt++] = i + 1;
+ str[i] = 0;
+ }
+ if(cnt != 2)
+ bug("invalid command file: invalid version string");
+ ver->major = parse_sb_subversion(str);
+ ver->minor = parse_sb_subversion(str + pos[0]);
+ ver->revision = parse_sb_subversion(str + pos[1]);
+}
+
static struct cmd_file_t *read_command_file(const char *file)
{
int size;
@@ -469,12 +515,52 @@ static struct cmd_file_t *read_command_file(const char *file)
struct cmd_file_t *cmd_file = xmalloc(sizeof(struct cmd_file_t));
memset(cmd_file, 0, sizeof(struct cmd_file_t));
+ generate_default_version(&cmd_file->product_ver);
+ generate_default_version(&cmd_file->component_ver);
+
struct lexem_t lexem;
char *p = buf;
char *end = buf + size;
#define next() next_lexem(&p, end, &lexem)
- /* sources */
+ /* init lexer */
next();
+ /* options ? */
+ if(lexem.type == LEX_IDENTIFIER && !strcmp(lexem.str, "options"))
+ {
+ next();
+ if(lexem.type != LEX_LBRACE)
+ bug("invalid command file: '{' expected after 'options'\n");
+
+ while(true)
+ {
+ next();
+ if(lexem.type == LEX_RBRACE)
+ break;
+ if(lexem.type != LEX_IDENTIFIER)
+ bug("invalid command file: identifier expected in options\n");
+ char *opt = lexem.str;
+ next();
+ if(lexem.type != LEX_EQUAL)
+ bug("invalid command file: '=' expected after identifier\n");
+ next();
+ if(!strcmp(opt, "productVersion") || !strcmp(opt, "componentVersion"))
+ {
+ if(lexem.type != LEX_STRING)
+ bug("invalid command file: string expected after '='\n");
+ if(!strcmp(opt, "productVersion"))
+ parse_sb_version(&cmd_file->product_ver, lexem.str);
+ else
+ parse_sb_version(&cmd_file->component_ver, lexem.str);
+ }
+ else
+ bug("invalid command file: unknown option '%s'\n", opt);
+ next();
+ if(lexem.type != LEX_SEMICOLON)
+ bug("invalid command file: ';' expected after string\n");
+ }
+ next();
+ }
+ /* sources */
if(lexem.type != LEX_IDENTIFIER || strcmp(lexem.str, "sources") != 0)
bug("invalid command file: 'sources' expected\n");
next();
@@ -686,6 +772,8 @@ struct sb_file_t
{
int nr_sections;
struct sb_section_t *sections;
+ struct sb_version_t product_ver;
+ struct sb_version_t component_ver;
/* for production use */
uint32_t image_size; /* in blocks */
};
@@ -759,6 +847,9 @@ static struct sb_file_t *apply_cmd_file(struct cmd_file_t *cmd_file)
{
struct sb_file_t *sb = xmalloc(sizeof(struct sb_file_t));
memset(sb, 0, sizeof(struct sb_file_t));
+
+ sb->product_ver = cmd_file->product_ver;
+ sb->component_ver = cmd_file->component_ver;
if(g_debug)
printf("Applying command file...\n");
@@ -972,14 +1063,16 @@ static uint64_t generate_timestamp()
return (uint64_t)t * 1000000L;
}
-void generate_version(struct sb_version_t *ver)
+static uint16_t swap16(uint16_t t)
{
- ver->major = 0x999;
- ver->pad0 = 0;
- ver->minor = 0x999;
- ver->pad1 = 0;
- ver->revision = 0x999;
- ver->pad2 = 0;
+ return (t << 8) | (t >> 8);
+}
+
+static void fix_version(struct sb_version_t *ver)
+{
+ ver->major = swap16(ver->major);
+ ver->minor = swap16(ver->minor);
+ ver->revision = swap16(ver->revision);
}
static void produce_sb_header(struct sb_file_t *sb, struct sb_header_t *sb_hdr)
@@ -1006,8 +1099,10 @@ static void produce_sb_header(struct sb_file_t *sb, struct sb_header_t *sb_hdr)
generate_random_data(sb_hdr->rand_pad0, sizeof(sb_hdr->rand_pad0));
generate_random_data(sb_hdr->rand_pad1, sizeof(sb_hdr->rand_pad1));
sb_hdr->timestamp = generate_timestamp();
- generate_version(&sb_hdr->product_ver);
- generate_version(&sb_hdr->component_ver);
+ sb_hdr->product_ver = sb->product_ver;
+ fix_version(&sb_hdr->product_ver);
+ sb_hdr->component_ver = sb->component_ver;
+ fix_version(&sb_hdr->component_ver);
sb_hdr->drive_tag = 0;
sha_1_init(&sha_1_params);
diff --git a/utils/sbtools/sb.h b/utils/sbtools/sb.h
index 9ffdba9191..a1482691ce 100644
--- a/utils/sbtools/sb.h
+++ b/utils/sbtools/sb.h
@@ -23,6 +23,7 @@
#define BLOCK_SIZE 16
+/* All fields are in big-endian BCD */
struct sb_version_t
{
uint16_t major;
diff --git a/utils/sbtools/sbtoelf.c b/utils/sbtools/sbtoelf.c
index f421f83848..d729357a56 100644
--- a/utils/sbtools/sbtoelf.c
+++ b/utils/sbtools/sbtoelf.c
@@ -339,7 +339,7 @@ static void extract_section(int data_sec, char name[5], byte *buf, int size, con
elf_release(&elf);
}
-void fill_section_name(char name[5], uint32_t identifier)
+static void fill_section_name(char name[5], uint32_t identifier)
{
name[0] = (identifier >> 24) & 0xff;
name[1] = (identifier >> 16) & 0xff;
@@ -351,6 +351,18 @@ void fill_section_name(char name[5], uint32_t identifier)
name[4] = 0;
}
+static uint16_t swap16(uint16_t t)
+{
+ return (t << 8) | (t >> 8);
+}
+
+static void fix_version(struct sb_version_t *ver)
+{
+ ver->major = swap16(ver->major);
+ ver->minor = swap16(ver->minor);
+ ver->revision = swap16(ver->revision);
+}
+
static void extract(unsigned long filesize)
{
struct sha_1_params_t sha_1_params;
@@ -433,16 +445,19 @@ static void extract(unsigned long filesize)
color(YELLOW);
printf("%s", asctime(time));
+ struct sb_version_t product_ver = sb_header->product_ver;
+ fix_version(&product_ver);
+ struct sb_version_t component_ver = sb_header->component_ver;
+ fix_version(&component_ver);
+
color(GREEN);
printf(" Product version = ");
color(YELLOW);
- printf("%X.%X.%X\n", sb_header->product_ver.major,
- sb_header->product_ver.minor, sb_header->product_ver.revision);
+ printf("%X.%X.%X\n", product_ver.major, product_ver.minor, product_ver.revision);
color(GREEN);
printf(" Component version = ");
color(YELLOW);
- printf("%X.%X.%X\n", sb_header->component_ver.major,
- sb_header->component_ver.minor, sb_header->component_ver.revision);
+ printf("%X.%X.%X\n", component_ver.major, component_ver.minor, component_ver.revision);
color(GREEN);
printf(" Drive tag = ");