disk: part_dos: update partition table entries after write

[J-u-boot.git] / tools / kwbimage.h

diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index e6e3d1d4f9addbaa8932b83e58665df54a1b7162..0b6d05bef1096df112f9fdc9bd24f438e8e1d957 100644 (file)
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _KWBIMAGE_H_
@@ -30,24 +29,22 @@
 #define IBR_HDR_UART_ID                        0x69
 #define IBR_DEF_ATTRIB                 0x00
 
-#define ALIGN_SUP(x, a) (((x) + (a - 1)) & ~(a - 1))
-
 /* Structure of the main header, version 0 (Kirkwood, Dove) */
 struct main_hdr_v0 {
-       uint8_t  blockid;               /*0     */
-       uint8_t  nandeccmode;           /*1     */
-       uint16_t nandpagesize;          /*2-3   */
-       uint32_t blocksize;             /*4-7   */
-       uint32_t rsvd1;                 /*8-11  */
-       uint32_t srcaddr;               /*12-15 */
-       uint32_t destaddr;              /*16-19 */
-       uint32_t execaddr;              /*20-23 */
-       uint8_t  satapiomode;           /*24    */
-       uint8_t  rsvd3;                 /*25    */
-       uint16_t ddrinitdelay;          /*26-27 */
-       uint16_t rsvd2;                 /*28-29 */
-       uint8_t  ext;                   /*30    */
-       uint8_t  checksum;              /*31    */
+       uint8_t  blockid;               /* 0x0       */
+       uint8_t  nandeccmode;           /* 0x1       */
+       uint16_t nandpagesize;          /* 0x2-0x3   */
+       uint32_t blocksize;             /* 0x4-0x7   */
+       uint32_t rsvd1;                 /* 0x8-0xB   */
+       uint32_t srcaddr;               /* 0xC-0xF   */
+       uint32_t destaddr;              /* 0x10-0x13 */
+       uint32_t execaddr;              /* 0x14-0x17 */
+       uint8_t  satapiomode;           /* 0x18      */
+       uint8_t  rsvd3;                 /* 0x19      */
+       uint16_t ddrinitdelay;          /* 0x1A-0x1B */
+       uint16_t rsvd2;                 /* 0x1C-0x1D */
+       uint8_t  ext;                   /* 0x1E      */
+       uint8_t  checksum;              /* 0x1F      */
 };
 
 struct ext_hdr_v0_reg {
@@ -70,27 +67,39 @@ struct kwb_header {
        struct ext_hdr_v0       kwb_exthdr;
 };
 
-/* Structure of the main header, version 1 (Armada 370, Armada XP) */
+/* Structure of the main header, version 1 (Armada 370/38x/XP) */
 struct main_hdr_v1 {
-       uint8_t  blockid;               /* 0 */
-       uint8_t  reserved1;             /* 1 */
-       uint16_t reserved2;             /* 2-3 */
-       uint32_t blocksize;             /* 4-7 */
-       uint8_t  version;               /* 8 */
-       uint8_t  headersz_msb;          /* 9 */
-       uint16_t headersz_lsb;          /* A-B */
-       uint32_t srcaddr;               /* C-F */
-       uint32_t destaddr;              /* 10-13 */
-       uint32_t execaddr;              /* 14-17 */
-       uint8_t  reserved3;             /* 18 */
-       uint8_t  nandblocksize;         /* 19 */
-       uint8_t  nandbadblklocation;    /* 1A */
-       uint8_t  reserved4;             /* 1B */
-       uint16_t reserved5;             /* 1C-1D */
-       uint8_t  ext;                   /* 1E */
-       uint8_t  checksum;              /* 1F */
+       uint8_t  blockid;               /* 0x0       */
+       uint8_t  flags;                 /* 0x1       */
+       uint16_t reserved2;             /* 0x2-0x3   */
+       uint32_t blocksize;             /* 0x4-0x7   */
+       uint8_t  version;               /* 0x8       */
+       uint8_t  headersz_msb;          /* 0x9       */
+       uint16_t headersz_lsb;          /* 0xA-0xB   */
+       uint32_t srcaddr;               /* 0xC-0xF   */
+       uint32_t destaddr;              /* 0x10-0x13 */
+       uint32_t execaddr;              /* 0x14-0x17 */
+       uint8_t  options;               /* 0x18      */
+       uint8_t  nandblocksize;         /* 0x19      */
+       uint8_t  nandbadblklocation;    /* 0x1A      */
+       uint8_t  reserved4;             /* 0x1B      */
+       uint16_t reserved5;             /* 0x1C-0x1D */
+       uint8_t  ext;                   /* 0x1E      */
+       uint8_t  checksum;              /* 0x1F      */
 };
 
+/*
+ * Main header options
+ */
+#define MAIN_HDR_V1_OPT_BAUD_DEFAULT   0
+#define MAIN_HDR_V1_OPT_BAUD_2400      0x1
+#define MAIN_HDR_V1_OPT_BAUD_4800      0x2
+#define MAIN_HDR_V1_OPT_BAUD_9600      0x3
+#define MAIN_HDR_V1_OPT_BAUD_19200     0x4
+#define MAIN_HDR_V1_OPT_BAUD_38400     0x5
+#define MAIN_HDR_V1_OPT_BAUD_57600     0x6
+#define MAIN_HDR_V1_OPT_BAUD_115200    0x7
+
 /*
  * Header for the optional headers, version 1 (Armada 370, Armada XP)
  */
@@ -101,6 +110,43 @@ struct opt_hdr_v1 {
        char     data[0];
 };
 
+/*
+ * Public Key data in DER format
+ */
+struct pubkey_der_v1 {
+       uint8_t key[524];
+};
+
+/*
+ * Signature (RSA 2048)
+ */
+struct sig_v1 {
+       uint8_t sig[256];
+};
+
+/*
+ * Structure of secure header (Armada 38x)
+ */
+struct secure_hdr_v1 {
+       uint8_t  headertype;            /* 0x0 */
+       uint8_t  headersz_msb;          /* 0x1 */
+       uint16_t headersz_lsb;          /* 0x2 - 0x3 */
+       uint32_t reserved1;             /* 0x4 - 0x7 */
+       struct pubkey_der_v1 kak;       /* 0x8 - 0x213 */
+       uint8_t  jtag_delay;            /* 0x214 */
+       uint8_t  reserved2;             /* 0x215 */
+       uint16_t reserved3;             /* 0x216 - 0x217 */
+       uint32_t boxid;                 /* 0x218 - 0x21B */
+       uint32_t flashid;               /* 0x21C - 0x21F */
+       struct sig_v1 hdrsig;           /* 0x220 - 0x31F */
+       struct sig_v1 imgsig;           /* 0x320 - 0x41F */
+       struct pubkey_der_v1 csk[16];   /* 0x420 - 0x24DF */
+       struct sig_v1 csksig;           /* 0x24E0 - 0x25DF */
+       uint8_t  next;                  /* 0x25E0 */
+       uint8_t  reserved4;             /* 0x25E1 */
+       uint16_t reserved5;             /* 0x25E2 - 0x25E3 */
+};
+
 /*
  * Various values for the opt_hdr_v1->headertype field, describing the
  * different types of optional headers. The "secure" header contains