tools: kwbimage: Fix arithmetic with void pointers

[u-boot] / tools / kwbimage.c

diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 369aba7bcab9d00e6c965354ff05bb579d420809..edc5d3453ac04f9f705f9f248bdcf5dcb82b3c4f 100644 (file)
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -68,6 +68,8 @@ struct image_cfg_element {
                IMAGE_CFG_BINARY,
                IMAGE_CFG_PAYLOAD,
                IMAGE_CFG_DATA,
+               IMAGE_CFG_BAUDRATE,
+               IMAGE_CFG_DEBUG,
        } type;
        union {
                unsigned int version;
@@ -85,6 +87,8 @@ struct image_cfg_element {
                unsigned int nandeccmode;
                unsigned int nandpagesz;
                struct ext_hdr_v0_reg regdata;
+               unsigned int baudrate;
+               unsigned int debug;
        };
 };
 
@@ -99,6 +103,7 @@ struct image_cfg_element {
 static const char *image_boot_mode_name(unsigned int id)
 {
        int i;
+
        for (i = 0; boot_modes[i].name; i++)
                if (boot_modes[i].id == id)
                        return boot_modes[i].name;
@@ -108,6 +113,7 @@ static const char *image_boot_mode_name(unsigned int id)
 int image_boot_mode_id(const char *boot_mode_name)
 {
        int i;
+
        for (i = 0; boot_modes[i].name; i++)
                if (!strcmp(boot_modes[i].name, boot_mode_name))
                        return boot_modes[i].id;
@@ -118,6 +124,7 @@ int image_boot_mode_id(const char *boot_mode_name)
 int image_nand_ecc_mode_id(const char *nand_ecc_mode_name)
 {
        int i;
+
        for (i = 0; nand_ecc_modes[i].name; i++)
                if (!strcmp(nand_ecc_modes[i].name, nand_ecc_mode_name))
                        return nand_ecc_modes[i].id;
@@ -195,6 +202,28 @@ static uint32_t image_checksum32(void *start, uint32_t len)
        return csum;
 }
 
+static uint8_t baudrate_to_option(unsigned int baudrate)
+{
+       switch (baudrate) {
+       case 2400:
+               return MAIN_HDR_V1_OPT_BAUD_2400;
+       case 4800:
+               return MAIN_HDR_V1_OPT_BAUD_4800;
+       case 9600:
+               return MAIN_HDR_V1_OPT_BAUD_9600;
+       case 19200:
+               return MAIN_HDR_V1_OPT_BAUD_19200;
+       case 38400:
+               return MAIN_HDR_V1_OPT_BAUD_38400;
+       case 57600:
+               return MAIN_HDR_V1_OPT_BAUD_57600;
+       case 115200:
+               return MAIN_HDR_V1_OPT_BAUD_115200;
+       default:
+               return MAIN_HDR_V1_OPT_BAUD_DEFAULT;
+       }
+}
+
 static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
                             int payloadsz)
 {
@@ -202,7 +231,7 @@ static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
        size_t headersz;
        struct main_hdr_v0 *main_hdr;
        struct ext_hdr_v0 *ext_hdr;
-       void *image;
+       uint8_t *image;
        int has_ext = 0;
 
        /*
@@ -229,7 +258,7 @@ static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
 
        memset(image, 0, headersz);
 
-       main_hdr = image;
+       main_hdr = (struct main_hdr_v0 *)image;
 
        /* Fill in the main header */
        main_hdr->blocksize =
@@ -255,7 +284,8 @@ static void *image_create_v0(size_t *imagesz, struct image_tool_params *params,
        if (has_ext) {
                int cfgi, datai;
 
-               ext_hdr = image + sizeof(struct main_hdr_v0);
+               ext_hdr = (struct ext_hdr_v0 *)
+                               (image + sizeof(struct main_hdr_v0));
                ext_hdr->offset = cpu_to_le32(0x40);
 
                for (cfgi = 0, datai = 0; cfgi < cfgn; cfgi++) {
@@ -333,14 +363,14 @@ static size_t image_headersz_v1(struct image_tool_params *params,
 
 #if defined(CONFIG_SYS_U_BOOT_OFFS)
        if (headersz > CONFIG_SYS_U_BOOT_OFFS) {
-               fprintf(stderr, "Error: Image header (incl. SPL image) too big!\n");
+               fprintf(stderr,
+                       "Error: Image header (incl. SPL image) too big!\n");
                fprintf(stderr, "header=0x%x CONFIG_SYS_U_BOOT_OFFS=0x%x!\n",
                        (int)headersz, CONFIG_SYS_U_BOOT_OFFS);
                fprintf(stderr, "Increase CONFIG_SYS_U_BOOT_OFFS!\n");
                return 0;
-       } else {
-               headersz = CONFIG_SYS_U_BOOT_OFFS;
        }
+       headersz = CONFIG_SYS_U_BOOT_OFFS;
 #endif
 
        /*
@@ -356,7 +386,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
        struct image_cfg_element *e, *binarye;
        struct main_hdr_v1 *main_hdr;
        size_t headersz;
-       void *image, *cur;
+       uint8_t *image, *cur;
        int hasext = 0;
        int ret;
 
@@ -376,15 +406,16 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
 
        memset(image, 0, headersz);
 
-       cur = main_hdr = image;
-       cur += sizeof(struct main_hdr_v1);
+       main_hdr = (struct main_hdr_v1 *)image;
+       cur = image + sizeof(struct main_hdr_v1);
 
        /* Fill the main header */
        main_hdr->blocksize    =
                cpu_to_le32(payloadsz - headersz + sizeof(uint32_t));
        main_hdr->headersz_lsb = cpu_to_le16(headersz & 0xFFFF);
        main_hdr->headersz_msb = (headersz & 0xFFFF0000) >> 16;
-       main_hdr->destaddr     = cpu_to_le32(params->addr);
+       main_hdr->destaddr     = cpu_to_le32(params->addr)
+                                - sizeof(image_header_t);
        main_hdr->execaddr     = cpu_to_le32(params->ep);
        main_hdr->srcaddr      = cpu_to_le32(headersz);
        main_hdr->ext          = hasext;
@@ -398,10 +429,16 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
        e = image_find_option(IMAGE_CFG_NAND_BADBLK_LOCATION);
        if (e)
                main_hdr->nandbadblklocation = e->nandbadblklocation;
+       e = image_find_option(IMAGE_CFG_BAUDRATE);
+       if (e)
+               main_hdr->options = baudrate_to_option(e->baudrate);
+       e = image_find_option(IMAGE_CFG_DEBUG);
+       if (e)
+               main_hdr->flags = e->debug ? 0x1 : 0;
 
        binarye = image_find_option(IMAGE_CFG_BINARY);
        if (binarye) {
-               struct opt_hdr_v1 *hdr = cur;
+               struct opt_hdr_v1 *hdr = (struct opt_hdr_v1 *)cur;
                uint32_t *args;
                size_t binhdrsz;
                struct stat s;
@@ -434,7 +471,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
 
                cur += sizeof(struct opt_hdr_v1);
 
-               args = cur;
+               args = (uint32_t *)cur;
                *args = cpu_to_le32(binarye->binary.nargs);
                args++;
                for (argi = 0; argi < binarye->binary.nargs; argi++)
@@ -481,11 +518,13 @@ static int image_create_config_parse_oneline(char *line,
        keyword = strtok_r(line, deliminiters, &saveptr);
        if (!strcmp(keyword, "VERSION")) {
                char *value = strtok_r(NULL, deliminiters, &saveptr);
+
                el->type = IMAGE_CFG_VERSION;
                el->version = atoi(value);
        } else if (!strcmp(keyword, "BOOT_FROM")) {
                char *value = strtok_r(NULL, deliminiters, &saveptr);
                int ret = image_boot_mode_id(value);
+
                if (ret < 0) {
                        fprintf(stderr,
                                "Invalid boot media '%s'\n", value);
@@ -495,16 +534,19 @@ static int image_create_config_parse_oneline(char *line,
                el->bootfrom = ret;
        } else if (!strcmp(keyword, "NAND_BLKSZ")) {
                char *value = strtok_r(NULL, deliminiters, &saveptr);
+
                el->type = IMAGE_CFG_NAND_BLKSZ;
                el->nandblksz = strtoul(value, NULL, 16);
        } else if (!strcmp(keyword, "NAND_BADBLK_LOCATION")) {
                char *value = strtok_r(NULL, deliminiters, &saveptr);
+
                el->type = IMAGE_CFG_NAND_BADBLK_LOCATION;
                el->nandbadblklocation =
                        strtoul(value, NULL, 16);
        } else if (!strcmp(keyword, "NAND_ECC_MODE")) {
                char *value = strtok_r(NULL, deliminiters, &saveptr);
                int ret = image_nand_ecc_mode_id(value);
+
                if (ret < 0) {
                        fprintf(stderr,
                                "Invalid NAND ECC mode '%s'\n", value);
@@ -514,6 +556,7 @@ static int image_create_config_parse_oneline(char *line,
                el->nandeccmode = ret;
        } else if (!strcmp(keyword, "NAND_PAGE_SIZE")) {
                char *value = strtok_r(NULL, deliminiters, &saveptr);
+
                el->type = IMAGE_CFG_NAND_PAGESZ;
                el->nandpagesz = strtoul(value, NULL, 16);
        } else if (!strcmp(keyword, "BINARY")) {
@@ -548,6 +591,14 @@ static int image_create_config_parse_oneline(char *line,
                el->type = IMAGE_CFG_DATA;
                el->regdata.raddr = strtoul(value1, NULL, 16);
                el->regdata.rdata = strtoul(value2, NULL, 16);
+       } else if (!strcmp(keyword, "BAUDRATE")) {
+               char *value = strtok_r(NULL, deliminiters, &saveptr);
+               el->type = IMAGE_CFG_BAUDRATE;
+               el->baudrate = strtoul(value, NULL, 10);
+       } else if (!strcmp(keyword, "DEBUG")) {
+               char *value = strtok_r(NULL, deliminiters, &saveptr);
+               el->type = IMAGE_CFG_DEBUG;
+               el->debug = strtoul(value, NULL, 10);
        } else {
                fprintf(stderr, "Ignoring unknown line '%s'\n", line);
        }
@@ -759,8 +810,8 @@ static int kwbimage_check_image_types(uint8_t type)
 {
        if (type == IH_TYPE_KWBIMAGE)
                return EXIT_SUCCESS;
-       else
-               return EXIT_FAILURE;
+
+       return EXIT_FAILURE;
 }
 
 static int kwbimage_verify_header(unsigned char *ptr, int image_size,
@@ -770,7 +821,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
        struct ext_hdr_v0 *ext_hdr;
        uint8_t checksum;
 
-       main_hdr = (void *)ptr;
+       main_hdr = (struct main_hdr_v0 *)ptr;
        checksum = image_checksum8(ptr,
                                   sizeof(struct main_hdr_v0)
                                   - sizeof(uint8_t));
@@ -779,7 +830,8 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
 
        /* Only version 0 extended header has checksum */
        if (image_version((void *)ptr) == 0) {
-               ext_hdr = (void *)ptr + sizeof(struct main_hdr_v0);
+               ext_hdr = (struct ext_hdr_v0 *)
+                               (ptr + sizeof(struct main_hdr_v0));
                checksum = image_checksum8(ext_hdr,
                                           sizeof(struct ext_hdr_v0)
                                           - sizeof(uint8_t));
@@ -833,9 +885,9 @@ static int kwbimage_generate(struct image_tool_params *params,
 static int kwbimage_check_params(struct image_tool_params *params)
 {
        if (!strlen(params->imagename)) {
-               fprintf(stderr, "Error:%s - Configuration file not specified, "
-                       "it is needed for kwbimage generation\n",
-                       params->cmdname);
+               char *msg = "Configuration file for kwbimage creation omitted";
+
+               fprintf(stderr, "Error:%s - %s\n", params->cmdname, msg);
                return CFG_INVALID;
        }