Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 37d108b64fabc625ae829bc6ee419c163d523c3b

Authored by Baruch Siach
Committed by Stefan Roese
1 parent ed72741d9f
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

tools/kwbimage.h: make offset marks style consistent 

The offset marking in kwbimage.h is inconsistent. main_hdr_v0 uses decimals,
main_hdr_v1 uses hex without '0x' prefix, secure_hdr_v1 uses hex with '0x'
prefix. Make all offset marks hex with '0x' prefix.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 1 changed file with 31 additions and 31 deletions Side-by-side Diff

... ... @@ -34,20 +34,20 @@
34 34  
35 35 /* Structure of the main header, version 0 (Kirkwood, Dove) */
36 36 struct main_hdr_v0 {
37   - uint8_t blockid; /*0 */
38   - uint8_t nandeccmode; /*1 */
39   - uint16_t nandpagesize; /*2-3 */
40   - uint32_t blocksize; /*4-7 */
41   - uint32_t rsvd1; /*8-11 */
42   - uint32_t srcaddr; /*12-15 */
43   - uint32_t destaddr; /*16-19 */
44   - uint32_t execaddr; /*20-23 */
45   - uint8_t satapiomode; /*24 */
46   - uint8_t rsvd3; /*25 */
47   - uint16_t ddrinitdelay; /*26-27 */
48   - uint16_t rsvd2; /*28-29 */
49   - uint8_t ext; /*30 */
50   - uint8_t checksum; /*31 */
  37 + uint8_t blockid; /* 0x0 */
  38 + uint8_t nandeccmode; /* 0x1 */
  39 + uint16_t nandpagesize; /* 0x2-0x3 */
  40 + uint32_t blocksize; /* 0x4-0x7 */
  41 + uint32_t rsvd1; /* 0x8-0xB */
  42 + uint32_t srcaddr; /* 0xC-0xF */
  43 + uint32_t destaddr; /* 0x10-0x13 */
  44 + uint32_t execaddr; /* 0x14-0x17 */
  45 + uint8_t satapiomode; /* 0x18 */
  46 + uint8_t rsvd3; /* 0x19 */
  47 + uint16_t ddrinitdelay; /* 0x1A-0x1B */
  48 + uint16_t rsvd2; /* 0x1C-0x1D */
  49 + uint8_t ext; /* 0x1E */
  50 + uint8_t checksum; /* 0x1F */
51 51 };
52 52  
53 53 struct ext_hdr_v0_reg {
... ... @@ -72,23 +72,23 @@
72 72  
73 73 /* Structure of the main header, version 1 (Armada 370/38x/XP) */
74 74 struct main_hdr_v1 {
75   - uint8_t blockid; /* 0 */
76   - uint8_t flags; /* 1 */
77   - uint16_t reserved2; /* 2-3 */
78   - uint32_t blocksize; /* 4-7 */
79   - uint8_t version; /* 8 */
80   - uint8_t headersz_msb; /* 9 */
81   - uint16_t headersz_lsb; /* A-B */
82   - uint32_t srcaddr; /* C-F */
83   - uint32_t destaddr; /* 10-13 */
84   - uint32_t execaddr; /* 14-17 */
85   - uint8_t options; /* 18 */
86   - uint8_t nandblocksize; /* 19 */
87   - uint8_t nandbadblklocation; /* 1A */
88   - uint8_t reserved4; /* 1B */
89   - uint16_t reserved5; /* 1C-1D */
90   - uint8_t ext; /* 1E */
91   - uint8_t checksum; /* 1F */
  75 + uint8_t blockid; /* 0x0 */
  76 + uint8_t flags; /* 0x1 */
  77 + uint16_t reserved2; /* 0x2-0x3 */
  78 + uint32_t blocksize; /* 0x4-0x7 */
  79 + uint8_t version; /* 0x8 */
  80 + uint8_t headersz_msb; /* 0x9 */
  81 + uint16_t headersz_lsb; /* 0xA-0xB */
  82 + uint32_t srcaddr; /* 0xC-0xF */
  83 + uint32_t destaddr; /* 0x10-0x13 */
  84 + uint32_t execaddr; /* 0x14-0x17 */
  85 + uint8_t options; /* 0x18 */
  86 + uint8_t nandblocksize; /* 0x19 */
  87 + uint8_t nandbadblklocation; /* 0x1A */
  88 + uint8_t reserved4; /* 0x1B */
  89 + uint16_t reserved5; /* 0x1C-0x1D */
  90 + uint8_t ext; /* 0x1E */
  91 + uint8_t checksum; /* 0x1F */
92 92 };
93 93  
94 94 /*