diff options
author | Tom Rini <trini@konsulko.com> | 2016-10-28 15:12:03 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-10-28 15:12:03 (GMT) |
commit | 4f892924d238cc415891dbea336a0fdaff2f853b (patch) | |
tree | 145882227f01a5092c656d1fc7122adff76bc8c2 /tools/imximage.h | |
parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
download | u-boot-fsl-qoriq-4f892924d238cc415891dbea336a0fdaff2f853b.tar.xz |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig
Diffstat (limited to 'tools/imximage.h')
-rw-r--r-- | tools/imximage.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/imximage.h b/tools/imximage.h index c7b9b5c..db8b9a3 100644 --- a/tools/imximage.h +++ b/tools/imximage.h @@ -9,6 +9,7 @@ #define _IMXIMAGE_H_ #define MAX_HW_CFG_SIZE_V2 220 /* Max number of registers imx can set for v2 */ +#define MAX_PLUGIN_CODE_SIZE (64 * 1024) #define MAX_HW_CFG_SIZE_V1 60 /* Max number of registers imx can set for v1 */ #define APP_CODE_BARKER 0xB1 #define DCD_BARKER 0xB17219E9 @@ -64,6 +65,7 @@ enum imximage_cmd { CMD_CHECK_BITS_SET, CMD_CHECK_BITS_CLR, CMD_CSF, + CMD_PLUGIN, }; enum imximage_fld_types { @@ -164,7 +166,10 @@ typedef struct { typedef struct { flash_header_v2_t fhdr; boot_data_t boot_data; - dcd_v2_t dcd_table; + union { + dcd_v2_t dcd_table; + char plugin_code[MAX_PLUGIN_CODE_SIZE]; + } data; } imx_header_v2_t; /* The header must be aligned to 4k on MX53 for NAND boot */ |