This adds a context struct to the config parser. This is a first
step to make the config parser usable from both imx-image and
imx-usb-loader which will be needed later.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
scripts/imx/imx-image.c | 66 +++++++++++++++++++++++++++----------------------
1 file changed, 36 insertions(+), 30 deletions(-)
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index 4b6359a..707852b 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -39,12 +39,15 @@
#define HEADER_LEN 0x1000 /* length of the blank area + IVT + DCD */
#define CSF_LEN 0x2000 /* length of the CSF (needed for HAB) */
-static uint32_t image_load_addr;
-static uint32_t image_dcd_offset = 0xffffffff;
+struct config_data {
+ uint32_t image_load_addr;
+ uint32_t image_dcd_offset;
+ int header_version;
+ int cpu_type;
+};
+
static uint32_t dcdtable[MAX_DCD];
static int curdcd;
-static int header_version;
-static int cpu_type;
static int add_barebox_header;
static int prepare_sign;
@@ -232,7 +235,7 @@ static int parse_line(char *line, char *argv[])
struct command {
const char *name;
- int (*parse)(int argc, char *argv[]);
+ int (*parse)(struct config_data *data, int argc, char *argv[]);
};
static uint32_t last_write_cmd;
@@ -299,7 +302,7 @@ static void do_cmd_check_usage(void)
"while_any_bit_set: while ((*addr & mask) != 0)\n");
}
-static int do_cmd_check(int argc, char *argv[])
+static int do_cmd_check(struct config_data *data, int argc, char *argv[])
{
uint32_t addr, mask, cmd;
int i, width;
@@ -351,7 +354,7 @@ static int do_cmd_check(int argc, char *argv[])
return 0;
}
-static int do_cmd_write_mem(int argc, char *argv[])
+static int do_cmd_write_mem(struct config_data *data, int argc, char *argv[])
{
uint32_t addr, val, width;
char *end;
@@ -391,7 +394,7 @@ static int do_cmd_write_mem(int argc, char *argv[])
return -EINVAL;
};
- switch (header_version) {
+ switch (data->header_version) {
case 1:
return write_mem_v1(addr, val, width);
case 2:
@@ -401,22 +404,22 @@ static int do_cmd_write_mem(int argc, char *argv[])
}
}
-static int do_loadaddr(int argc, char *argv[])
+static int do_loadaddr(struct config_data *data, int argc, char *argv[])
{
if (argc < 2)
return -EINVAL;
- image_load_addr = strtoul(argv[1], NULL, 0);
+ data->image_load_addr = strtoul(argv[1], NULL, 0);
return 0;
}
-static int do_dcd_offset(int argc, char *argv[])
+static int do_dcd_offset(struct config_data *data, int argc, char *argv[])
{
if (argc < 2)
return -EINVAL;
- image_dcd_offset = strtoul(argv[1], NULL, 0);
+ data->image_dcd_offset = strtoul(argv[1], NULL, 0);
return 0;
}
@@ -435,7 +438,7 @@ static struct soc_type socs[] = {
{ .name = "imx6", .header_version = 2, .cpu_type = 6 },
};
-static int do_soc(int argc, char *argv[])
+static int do_soc(struct config_data *data, int argc, char *argv[])
{
char *soc;
int i;
@@ -447,8 +450,8 @@ static int do_soc(int argc, char *argv[])
for (i = 0; i < ARRAY_SIZE(socs); i++) {
if (!strcmp(socs[i].name, soc)) {
- header_version = socs[i].header_version;
- cpu_type = socs[i].cpu_type;
+ data->header_version = socs[i].header_version;
+ data->cpu_type = socs[i].cpu_type;
return 0;
}
}
@@ -480,7 +483,7 @@ struct command cmds[] = {
},
};
-static char *readcmd(FILE *f)
+static char *readcmd(struct config_data *data, FILE *f)
{
static char *buf;
char *str;
@@ -509,7 +512,7 @@ static char *readcmd(FILE *f)
}
}
-static int parse_config(const char *filename)
+static int parse_config(struct config_data *data, const char *filename)
{
FILE *f;
int lineno = 0;
@@ -524,7 +527,7 @@ static int parse_config(const char *filename)
}
while (1) {
- line = readcmd(f);
+ line = readcmd(data, f);
if (!line)
break;
@@ -542,7 +545,7 @@ static int parse_config(const char *filename)
for (i = 0; i < ARRAY_SIZE(cmds); i++) {
if (!strcmp(cmds[i].name, argv[0])) {
- ret = cmds[i].parse(nargs, argv);
+ ret = cmds[i].parse(data, nargs, argv);
if (ret) {
fprintf(stderr, "error in line %d: %s\n",
lineno, strerror(-ret));
@@ -628,6 +631,9 @@ int main(int argc, char *argv[])
int infd, outfd;
int dcd_only = 0;
int now = 0;
+ struct config_data data = {
+ .image_dcd_offset = 0xffffffff,
+ };
while ((opt = getopt(argc, argv, "c:hf:o:bdp")) != -1) {
switch (opt) {
@@ -681,7 +687,7 @@ int main(int argc, char *argv[])
image_size = s.st_size;
}
- ret = parse_config(configfile);
+ ret = parse_config(&data, configfile);
if (ret)
exit(1);
@@ -689,18 +695,18 @@ int main(int argc, char *argv[])
if (!buf)
exit(1);
- if (image_dcd_offset == 0xffffffff) {
+ if (data.image_dcd_offset == 0xffffffff) {
fprintf(stderr, "no dcd offset given ('dcdofs'). Defaulting to 0x%08x\n",
FLASH_HEADER_OFFSET);
- image_dcd_offset = FLASH_HEADER_OFFSET;
+ data.image_dcd_offset = FLASH_HEADER_OFFSET;
}
- if (!header_version) {
+ if (!data.header_version) {
fprintf(stderr, "no SoC given. (missing 'soc' in config)\n");
exit(1);
}
- if (header_version == 2)
+ if (data.header_version == 2)
check_last_dcd(0);
if (dcd_only) {
@@ -720,19 +726,19 @@ int main(int argc, char *argv[])
*/
load_size = roundup(image_size + HEADER_LEN, 0x1000);
- if (cpu_type == 35)
+ if (data.cpu_type == 35)
load_size += HEADER_LEN;
- switch (header_version) {
+ switch (data.header_version) {
case 1:
- add_header_v1(buf, image_dcd_offset, image_load_addr, load_size);
+ add_header_v1(buf, data.image_dcd_offset, data.image_load_addr, load_size);
break;
case 2:
- add_header_v2(buf, image_dcd_offset, image_load_addr, load_size);
+ add_header_v2(buf, data.image_dcd_offset, data.image_load_addr, load_size);
break;
default:
fprintf(stderr, "Congratulations! You're welcome to implement header version %d\n",
- header_version);
+ data.header_version);
exit(1);
}
@@ -766,7 +772,7 @@ int main(int argc, char *argv[])
exit(1);
}
- if (cpu_type == 35) {
+ if (data.cpu_type == 35) {
ret = xwrite(outfd, buf, HEADER_LEN);
if (ret < 0) {
perror("write");
--
2.7.0.rc3
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
