diff options
Diffstat (limited to 'utils/imxtools/sbtools/elftosb1.c')
-rw-r--r-- | utils/imxtools/sbtools/elftosb1.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/utils/imxtools/sbtools/elftosb1.c b/utils/imxtools/sbtools/elftosb1.c index 43f9b1e9be..83e1c175bc 100644 --- a/utils/imxtools/sbtools/elftosb1.c +++ b/utils/imxtools/sbtools/elftosb1.c | |||
@@ -68,24 +68,6 @@ static char *cmd_line_next_arg(void *user) | |||
68 | return *(uu->argv - 1); | 68 | return *(uu->argv - 1); |
69 | } | 69 | } |
70 | 70 | ||
71 | static bool elf_read(void *user, uint32_t addr, void *buf, size_t count) | ||
72 | { | ||
73 | if(fseek((FILE *)user, addr, SEEK_SET) == -1) | ||
74 | return false; | ||
75 | return fread(buf, 1, count, (FILE *)user) == count; | ||
76 | } | ||
77 | |||
78 | static void elf_printf(void *user, bool error, const char *fmt, ...) | ||
79 | { | ||
80 | if(!g_debug && !error) | ||
81 | return; | ||
82 | (void) user; | ||
83 | va_list args; | ||
84 | va_start(args, fmt); | ||
85 | vprintf(fmt, args); | ||
86 | va_end(args); | ||
87 | } | ||
88 | |||
89 | static int sb1_add_inst(struct sb1_file_t *sb, struct sb1_inst_t *insts, int nr_insts) | 71 | static int sb1_add_inst(struct sb1_file_t *sb, struct sb1_inst_t *insts, int nr_insts) |
90 | { | 72 | { |
91 | sb->insts = augment_array(sb->insts, sizeof(struct sb1_inst_t), sb->nr_insts, | 73 | sb->insts = augment_array(sb->insts, sizeof(struct sb1_inst_t), sb->nr_insts, |
@@ -402,7 +384,7 @@ static int load_elf(struct sb1_file_t *sb, const char *filename, int act) | |||
402 | if(g_debug) | 384 | if(g_debug) |
403 | printf("Loading elf file '%s'...\n", filename); | 385 | printf("Loading elf file '%s'...\n", filename); |
404 | elf_init(&elf); | 386 | elf_init(&elf); |
405 | bool loaded = elf_read_file(&elf, elf_read, elf_printf, fd); | 387 | bool loaded = elf_read_file(&elf, elf_std_read, generic_std_printf, fd); |
406 | fclose(fd); | 388 | fclose(fd); |
407 | if(!loaded) | 389 | if(!loaded) |
408 | bug("error loading elf file '%s'\n", filename); | 390 | bug("error loading elf file '%s'\n", filename); |