diff --git a/utils/imxtools/sbtools/dbparser.h b/utils/imxtools/sbtools/dbparser.h index 4a36861..d58cfb6 100644 --- a/utils/imxtools/sbtools/dbparser.h +++ b/utils/imxtools/sbtools/dbparser.h @@ -51,7 +51,9 @@ struct cmd_source_t struct cmd_source_t *next; /* for later use */ enum cmd_source_type_t type; - bool loaded; + bool bin_loaded; + bool elf_loaded; + struct elf_params_t elf; struct bin_param_t bin; }; diff --git a/utils/imxtools/sbtools/elftosb.c b/utils/imxtools/sbtools/elftosb.c index 43bcf34..98d0bdc 100644 --- a/utils/imxtools/sbtools/elftosb.c +++ b/utils/imxtools/sbtools/elftosb.c @@ -89,7 +89,7 @@ static void load_elf_by_id(struct cmd_file_t *cmd_file, const char *id) if(src == NULL) bug("undefined reference to source '%s'\n", id); /* avoid reloading */ - if(src->type == CMD_SRC_ELF && src->loaded) + if(src->type == CMD_SRC_ELF && src->elf_loaded) return; if(src->type != CMD_SRC_UNK) bug("source '%s' seen both as elf and binary file\n", id); @@ -103,9 +103,9 @@ static void load_elf_by_id(struct cmd_file_t *cmd_file, const char *id) if(g_debug) printf("Loading ELF file '%s'...\n", src->filename); elf_init(&src->elf); - src->loaded = elf_read_file(&src->elf, elf_read, elf_printf, fd); + src->elf_loaded = elf_read_file(&src->elf, elf_read, elf_printf, fd); fclose(fd); - if(!src->loaded) + if(!src->elf_loaded) bug("error loading elf file '%s' (id '%s')\n", src->filename, id); elf_translate_addresses(&src->elf); } @@ -116,7 +116,7 @@ static void load_bin_by_id(struct cmd_file_t *cmd_file, const char *id) if(src == NULL) bug("undefined reference to source '%s'\n", id); /* avoid reloading */ - if(src->type == CMD_SRC_BIN && src->loaded) + if(src->type == CMD_SRC_BIN && src->bin_loaded) return; if(src->type != CMD_SRC_UNK) bug("source '%s' seen both as elf and binary file\n", id); @@ -135,7 +135,7 @@ static void load_bin_by_id(struct cmd_file_t *cmd_file, const char *id) src->bin.data = xmalloc(src->bin.size); fread(src->bin.data, 1, src->bin.size, fd); fclose(fd); - src->loaded = true; + src->bin_loaded = true; } static struct sb_file_t *apply_cmd_file(struct cmd_file_t *cmd_file)