diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-01-29 09:06:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-04 08:29:15 +0100 |
| commit | 310b4a4ce3a35a379affe18e556c9294c6735d0a (patch) | |
| tree | 619a71ba8ccba1d74c30df2be725261d1ee8a425 /scripts | |
| parent | 271c93f99fa91574229be7a39db05ae7ffd3ccb5 (diff) | |
| download | barebox-310b4a4ce3a35a379affe18e556c9294c6735d0a.tar.gz barebox-310b4a4ce3a35a379affe18e556c9294c6735d0a.tar.xz | |
scripts: imx-image: pass config data to add_header_*
Now that we have a config data struct we can pass it to add_header_*
to reduce the argument count.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/imx/imx-image.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c index f9d0640c40..d804ab4322 100644 --- a/scripts/imx/imx-image.c +++ b/scripts/imx/imx-image.c @@ -72,11 +72,14 @@ static uint32_t bb_header[] = { 0x55555555, }; -static int add_header_v1(void *buf, int offset, uint32_t loadaddr, uint32_t imagesize) +static int add_header_v1(struct config_data *data, void *buf) { struct imx_flash_header *hdr; int dcdsize = curdcd * sizeof(uint32_t); uint32_t *psize = buf + ARM_HEAD_SIZE_OFFSET; + int offset = data->image_dcd_offset; + uint32_t loadaddr = data->image_load_addr; + uint32_t imagesize = data->load_size; if (add_barebox_header) { memcpy(buf, bb_header, sizeof(bb_header)); @@ -127,11 +130,14 @@ static int write_mem_v1(uint32_t addr, uint32_t val, int width) * ============================================================================ */ -static int add_header_v2(void *buf, int offset, uint32_t loadaddr, uint32_t imagesize) +static int add_header_v2(struct config_data *data, void *buf) { struct imx_flash_header_v2 *hdr; int dcdsize = curdcd * sizeof(uint32_t); uint32_t *psize = buf + ARM_HEAD_SIZE_OFFSET; + int offset = data->image_dcd_offset; + uint32_t loadaddr = data->image_load_addr; + uint32_t imagesize = data->load_size; if (add_barebox_header) memcpy(buf, bb_header, sizeof(bb_header)); @@ -423,10 +429,10 @@ int main(int argc, char *argv[]) switch (data.header_version) { case 1: - add_header_v1(buf, data.image_dcd_offset, data.image_load_addr, data.load_size); + add_header_v1(&data, buf); break; case 2: - add_header_v2(buf, data.image_dcd_offset, data.image_load_addr, data.load_size); + add_header_v2(&data, buf); break; default: fprintf(stderr, "Congratulations! You're welcome to implement header version %d\n", |