diff options
| author | Tom Rini <[email protected]> | 2021-10-28 07:57:54 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-28 07:57:54 -0400 |
| commit | aafc378a6caef453a40f2f9f3d6bef69e592c28d (patch) | |
| tree | d0f4d216618e2309099144c94f4ee0a397a25cee /cmd | |
| parent | e7fb789612e39653f9f20ad08ad40896c7f61742 (diff) | |
| parent | 7af368f4717a2c4b118f8cae597e268dc88a726c (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Fix usage of BIN header arguments (Pali)
- mvebu: turris_omnia: Fix MTD partitions order for Linux (Pali)
- mvebu: nandpagesize support for kwbimage v1 (Pali)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mvebu/bubt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index d4f381b6ad9..a7f3ff3c6fc 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -85,11 +85,11 @@ struct mvebu_image_info { }; #endif -/* Structure of the main header, version 1 (Armada 370/38x/XP) */ +/* Structure of the main header, version 1 (Armada 370/XP/375/38x/39x) */ struct a38x_main_hdr_v1 { u8 blockid; /* 0x0 */ u8 flags; /* 0x1 */ - u16 reserved2; /* 0x2-0x3 */ + u16 nandpagesize; /* 0x2-0x3 */ u32 blocksize; /* 0x4-0x7 */ u8 version; /* 0x8 */ u8 headersz_msb; /* 0x9 */ |