Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[people/ms/u-boot.git] / tools / imximage.c

diff --git a/tools/imximage.c b/tools/imximage.c
index 526b7d490d5c38cca59c6abfd12ac3f15f3931ab..6f469ae6336c064cd0ceb2534929b6396f22f1c1 100644 (file)
--- a/tools/imximage.c
+++ b/tools/imximage.c
@@ -38,6 +38,7 @@ static table_entry_t imximage_boot_offset[] = {
        {FLASH_OFFSET_SATA,     "sata",         "SATA Disk",    },
        {FLASH_OFFSET_SD,       "sd",           "SD Card",      },
        {FLASH_OFFSET_SPI,      "spi",          "SPI Flash",    },
+       {FLASH_OFFSET_QSPI,     "qspi",         "QSPI NOR Flash",},
        {-1,                    "",             "Invalid",      },
 };
 
@@ -52,6 +53,7 @@ static table_entry_t imximage_boot_loadsize[] = {
        {FLASH_LOADSIZE_SATA,           "sata",         "SATA Disk",    },
        {FLASH_LOADSIZE_SD,             "sd",           "SD Card",      },
        {FLASH_LOADSIZE_SPI,            "spi",          "SPI Flash",    },
+       {FLASH_LOADSIZE_QSPI,           "qspi",         "QSPI NOR Flash",},
        {-1,                            "",             "Invalid",      },
 };
 
@@ -694,19 +696,17 @@ static int imximage_generate(struct image_tool_params *params,
 /*
  * imximage parameters
  */
-static struct image_type_params imximage_params = {
-       .name           = "Freescale i.MX Boot Image support",
-       .header_size    = 0,
-       .hdr            = NULL,
-       .check_image_type = imximage_check_image_types,
-       .verify_header  = imximage_verify_header,
-       .print_header   = imximage_print_header,
-       .set_header     = imximage_set_header,
-       .check_params   = imximage_check_params,
-       .vrec_header    = imximage_generate,
-};
-
-void init_imx_image_type(void)
-{
-       register_image_type(&imximage_params);
-}
+U_BOOT_IMAGE_TYPE(
+       imximage,
+       "Freescale i.MX Boot Image support",
+       0,
+       NULL,
+       imximage_check_params,
+       imximage_verify_header,
+       imximage_print_header,
+       imximage_set_header,
+       NULL,
+       imximage_check_image_types,
+       NULL,
+       imximage_generate
+);