From 33cdd9eeaaff48d083af5c0126823348c2b44d97 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Fri, 22 Oct 2021 12:37:48 +0200 Subject: arm: mvebu: Update name of kwbimage v1 field at offset 0x2-0x3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit At this offset is stored nand page size. Signed-off-by: Pali Rohár Reviewed-by: Stefan Roese --- cmd/mvebu/bubt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index d4f381b6ad9..543eca817cc 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -89,7 +89,7 @@ struct mvebu_image_info { 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 */ -- cgit v1.3.1 From 7af368f4717a2c4b118f8cae597e268dc88a726c Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Fri, 22 Oct 2021 12:41:10 +0200 Subject: arm: mvebu: Fix comments about kwbimage structures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kwbimage v1 is used on more SoCs. Signed-off-by: Pali Rohár Reviewed-by: Stefan Roese --- arch/arm/mach-mvebu/spl.c | 2 +- cmd/mvebu/bubt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 27389bfa784..cad3f0a4889 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -72,7 +72,7 @@ #define IBR_HDR_UART_ID 0x69 #define IBR_HDR_SDIO_ID 0xAE -/* 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 kwbimage_main_hdr_v1 { uint8_t blockid; /* 0x0 */ uint8_t flags; /* 0x1 */ diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 543eca817cc..a7f3ff3c6fc 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -85,7 +85,7 @@ 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 */ -- cgit v1.3.1