[U-Boot] [PATCH] tools: socfpga: fix sfp_verify_header
Fix sfp_verify_header to return correct version number. This fixes "Not a sane SOCFPGA preloader" error message with v1 header.
Signed-off-by: Atsushi Nemoto atsushi.nemoto@sord.co.jp --- tools/socfpgaimage.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 390c9bb..fea22b4 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -174,6 +174,7 @@ static int sfp_verify_header(const uint8_t *buf, uint8_t *ver) if (le32_to_cpu(header_v0.validation) != VALIDATION_WORD) return -1;
+ *ver = header_v0.version; if (header_v0.version == 0) { hdr_csum = le16_to_cpu(header_v0.checksum); sfp_csum = sfp_hdr_checksum((uint8_t *)&header_v0, 0);
On 09/20/2018 10:12 AM, Atsushi Nemoto wrote:
Fix sfp_verify_header to return correct version number. This fixes "Not a sane SOCFPGA preloader" error message with v1 header.
Signed-off-by: Atsushi Nemoto atsushi.nemoto@sord.co.jp
tools/socfpgaimage.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/tools/socfpgaimage.c b/tools/socfpgaimage.c index 390c9bb..fea22b4 100644 --- a/tools/socfpgaimage.c +++ b/tools/socfpgaimage.c @@ -174,6 +174,7 @@ static int sfp_verify_header(const uint8_t *buf, uint8_t *ver) if (le32_to_cpu(header_v0.validation) != VALIDATION_WORD) return -1;
- *ver = header_v0.version; if (header_v0.version == 0) { hdr_csum = le16_to_cpu(header_v0.checksum); sfp_csum = sfp_hdr_checksum((uint8_t *)&header_v0, 0);
Hello Nemoto-san,
This *ver assignment should be just before return img_len, so we don't set the *ver until we did all the checks. Otherwise it's good. Can you send a V2 ?
Thanks!
Hi Marek,
On Thu, 20 Sep 2018 15:31:05 +0200, Marek Vasut marek.vasut@gmail.com wrote:
This *ver assignment should be just before return img_len, so we don't set the *ver until we did all the checks. Otherwise it's good. Can you send a V2 ?
Thank you for the review. I will post a new patch soon.
--- Atsushi Nemoto
participants (2)
-
Atsushi Nemoto -
Marek Vasut