Merge git://git.denx.de/u-boot-rockchip

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

diff --git a/tools/imximage.h b/tools/imximage.h
index efe6a88d9ea4ebea22e909f96420a3be176ca872..c7b9b5c8cc41fea8c409fd43175f8956e276985c 100644 (file)
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -2,13 +2,13 @@
  * (C) Copyright 2009
  * Stefano Babic, DENX Software Engineering, sbabic@denx.de.
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _IMXIMAGE_H_
 #define _IMXIMAGE_H_
 
-#define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
+#define MAX_HW_CFG_SIZE_V2 220 /* Max number of registers imx can set for v2 */
 #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
@@ -29,6 +29,7 @@
 #define FLASH_OFFSET_ONENAND   0x100
 #define FLASH_OFFSET_NOR       0x1000
 #define FLASH_OFFSET_SATA      FLASH_OFFSET_STANDARD
+#define FLASH_OFFSET_QSPI      0x1000
 
 /* Initial Load Region Size */
 #define FLASH_LOADSIZE_UNDEFINED       0xFFFFFFFF
@@ -39,20 +40,29 @@
 #define FLASH_LOADSIZE_ONENAND         0x400
 #define FLASH_LOADSIZE_NOR             0x0 /* entire image */
 #define FLASH_LOADSIZE_SATA            FLASH_LOADSIZE_STANDARD
-
-#define IVT_HEADER_TAG 0xD1
-#define IVT_VERSION 0x40
-#define DCD_HEADER_TAG 0xD2
-#define DCD_COMMAND_TAG 0xCC
-#define DCD_VERSION 0x40
-#define DCD_COMMAND_PARAM 0x4
+#define FLASH_LOADSIZE_QSPI            0x0 /* entire image */
+
+/* Command tags and parameters */
+#define IVT_HEADER_TAG                 0xD1
+#define IVT_VERSION                    0x40
+#define DCD_HEADER_TAG                 0xD2
+#define DCD_VERSION                    0x40
+#define DCD_WRITE_DATA_COMMAND_TAG     0xCC
+#define DCD_WRITE_DATA_PARAM           0x4
+#define DCD_WRITE_CLR_BIT_PARAM        0xC
+#define DCD_CHECK_DATA_COMMAND_TAG     0xCF
+#define DCD_CHECK_BITS_SET_PARAM       0x14
+#define DCD_CHECK_BITS_CLR_PARAM       0x04
 
 enum imximage_cmd {
        CMD_INVALID,
        CMD_IMAGE_VERSION,
        CMD_BOOT_FROM,
        CMD_BOOT_OFFSET,
-       CMD_DATA,
+       CMD_WRITE_DATA,
+       CMD_WRITE_CLR_BIT,
+       CMD_CHECK_BITS_SET,
+       CMD_CHECK_BITS_CLR,
        CMD_CSF,
 };
 
@@ -123,10 +133,15 @@ typedef struct {
        uint8_t param;
 } __attribute__((packed)) write_dcd_command_t;
 
-typedef struct {
-       ivt_header_t header;
+struct dcd_v2_cmd {
        write_dcd_command_t write_dcd_command;
        dcd_addr_data_t addr_data[MAX_HW_CFG_SIZE_V2];
+};
+
+typedef struct {
+       ivt_header_t header;
+       struct dcd_v2_cmd dcd_cmd;
+       uint32_t padding[1]; /* end up on an 8-byte boundary */
 } dcd_v2_t;
 
 typedef struct {
@@ -165,6 +180,9 @@ typedef void (*set_dcd_val_t)(struct imx_header *imxhdr,
                                        int fld, uint32_t value,
                                        uint32_t off);
 
+typedef void (*set_dcd_param_t)(struct imx_header *imxhdr, uint32_t dcd_len,
+                                       int32_t cmd);
+
 typedef void (*set_dcd_rst_t)(struct imx_header *imxhdr,
                                        uint32_t dcd_len,
                                        char *name, int lineno);