diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-25 14:03:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-02 15:41:04 +0100 |
| commit | 2cc35fe5de5f8e1fd3d933f88f6994d4ce8e0b5b (patch) | |
| tree | 0eea1c6a8383508561d947c32ab51dd2128ee51a /scripts | |
| parent | 28809d15176b9547f1f50d97923fc174251509fa (diff) | |
| download | barebox-2cc35fe5de5f8e1fd3d933f88f6994d4ce8e0b5b.tar.gz barebox-2cc35fe5de5f8e1fd3d933f88f6994d4ce8e0b5b.tar.xz | |
scripts: imx-image: move check to context data
Move the config parsers check function to context data to make
it possible to pass in a different version of this function later.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/imx/imx-image.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c index da85e5c9d3..ae7d3c84bc 100644 --- a/scripts/imx/imx-image.c +++ b/scripts/imx/imx-image.c @@ -41,6 +41,7 @@ struct config_data { uint32_t image_dcd_offset; int header_version; int cpu_type; + int (*check)(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t mask); int (*write_mem)(struct config_data *data, uint32_t addr, uint32_t val, int width); }; @@ -311,6 +312,9 @@ static int do_cmd_check(struct config_data *data, int argc, char *argv[]) return -EINVAL; } + if (!data->check) + return -ENOSYS; + width = strtoul(argv[1], NULL, 0) >> 3; scmd = argv[2]; addr = strtoul(argv[3], NULL, 0); @@ -343,13 +347,7 @@ static int do_cmd_check(struct config_data *data, int argc, char *argv[]) cmd = (TAG_CHECK << 24) | (i << 3) | width | ((sizeof(uint32_t) * 3) << 8); - check_last_dcd(cmd); - - dcdtable[curdcd++] = htobe32(cmd); - dcdtable[curdcd++] = htobe32(addr); - dcdtable[curdcd++] = htobe32(mask); - - return 0; + return data->check(data, cmd, addr, mask); } static int do_cmd_write_mem(struct config_data *data, int argc, char *argv[]) @@ -609,6 +607,22 @@ static int write_dcd(const char *outfile) return 0; } +static int check(struct config_data *data, uint32_t cmd, uint32_t addr, uint32_t mask) +{ + if (curdcd > MAX_DCD - 3) { + fprintf(stderr, "At maximum %d dcd entried are allowed\n", MAX_DCD); + return -ENOMEM; + } + + check_last_dcd(cmd); + + dcdtable[curdcd++] = htobe32(cmd); + dcdtable[curdcd++] = htobe32(addr); + dcdtable[curdcd++] = htobe32(mask); + + return 0; +} + static int write_mem(struct config_data *data, uint32_t addr, uint32_t val, int width) { switch (data->header_version) { @@ -637,6 +651,7 @@ int main(int argc, char *argv[]) struct config_data data = { .image_dcd_offset = 0xffffffff, .write_mem = write_mem, + .check = check, }; while ((opt = getopt(argc, argv, "c:hf:o:bdp")) != -1) { |