diff options
| -rw-r--r-- | scripts/imx/README | 1 | ||||
| -rw-r--r-- | scripts/imx/imx-image.c | 28 | ||||
| -rw-r--r-- | scripts/imx/imx.c | 11 | ||||
| -rw-r--r-- | scripts/imx/imx.h | 1 |
4 files changed, 41 insertions, 0 deletions
diff --git a/scripts/imx/README b/scripts/imx/README index 474b387cfc..b5cdb487a0 100644 --- a/scripts/imx/README +++ b/scripts/imx/README @@ -32,6 +32,7 @@ check <width> <cond> <addr> <mask> Poll until condition becomes true. while_any_bit_set set_bits <width> <addr> <bits> set <bits> in register <addr> clear_bits <width> <addr> <bits> clear <bits> in register <addr> +nop do nothing the i.MX SoCs support a wide range of fancy things doing with the flash header. We limit ourselves to a very simple case, that is the flash header has a fixed diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c index 650a67f604..dd5799cccc 100644 --- a/scripts/imx/imx-image.c +++ b/scripts/imx/imx-image.c @@ -482,6 +482,33 @@ static int write_mem(const struct config_data *data, uint32_t addr, } } +static int nop(const struct config_data *data) +{ + const struct imx_ivt_header nop_header = { + .tag = TAG_NOP, + .length = htobe16(4), + .version = 0, + }; + + switch (data->header_version) { + case 1: + fprintf(stderr, "DCD command NOP not implemented on DCD v1\n"); + return -EINVAL; + case 2: + if (curdcd > MAX_DCD - 1) { + fprintf(stderr, "At maximum %d DCD entries allowed\n", + MAX_DCD); + return -ENOMEM; + } + + check_last_dcd(*((uint32_t *) &nop_header)); + dcdtable[curdcd++] = *((uint32_t *) &nop_header); + return 0; + default: + return -EINVAL; + } +} + /* * This uses the Freescale Code Signing Tool (CST) to sign the image. * The cst is expected to be executable as 'cst' or if exists, the content @@ -653,6 +680,7 @@ int main(int argc, char *argv[]) .image_dcd_offset = 0xffffffff, .write_mem = write_mem, .check = check, + .nop = nop, }; prgname = argv[0]; diff --git a/scripts/imx/imx.c b/scripts/imx/imx.c index c8ee3091e0..fba049e78a 100644 --- a/scripts/imx/imx.c +++ b/scripts/imx/imx.c @@ -131,6 +131,14 @@ static int do_cmd_check(struct config_data *data, int argc, char *argv[]) return data->check(data, cmd, addr, mask); } +static int do_cmd_nop(struct config_data *data, int argc, char *argv[]) +{ + if (!data->nop) + return -ENOSYS; + + return data->nop(data); +} + static int write_mem(struct config_data *data, int argc, char *argv[], int set_bits, int clear_bits) { @@ -365,6 +373,9 @@ struct command cmds[] = { .name = "check", .parse = do_cmd_check, }, { + .name = "nop", + .parse = do_cmd_nop, + }, { .name = "loadaddr", .parse = do_loadaddr, }, { diff --git a/scripts/imx/imx.h b/scripts/imx/imx.h index ae3702c116..57c7525369 100644 --- a/scripts/imx/imx.h +++ b/scripts/imx/imx.h @@ -77,6 +77,7 @@ struct config_data { uint32_t addr, uint32_t mask); int (*write_mem)(const struct config_data *data, uint32_t addr, uint32_t val, int width, int set_bits, int clear_bits); + int (*nop)(const struct config_data *data); int csf_space; char *csf; }; |