diff options
| author | Tom Rini <trini@konsulko.com> | 2024-08-06 09:36:46 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-08-06 09:36:46 -0600 |
| commit | b7d5ce05b1b52136af09cf34541c6a91079a4b86 (patch) | |
| tree | cd030b59b9e5ab58e4decad781c526c2b4b8112d /tools | |
| parent | 784c70c04012b86edb5a903d3a6e7958267a7ea5 (diff) | |
| parent | 541a1649e74787682902d820d0b79e16bad69a4f (diff) | |
| download | u-boot-b7d5ce05b1b52136af09cf34541c6a91079a4b86.tar.gz | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiWIP/06Aug2024
This updates the "old style" DTs to that of Linux v6.10, matching what
OF_UPSTREAM is at now. Hopefully we won't need to do this (manually)
anymore. Since this brings in the DT for a new board (Tanix TX1), also
add the defconfig for that, which has just been waiting for that sync.
There are three more fixes: two for the SPI clock setup, which avoids
too high frequencies in some cases, and one fix to avoid a build warning
with GCC 14 for the sunxi TOC0 part of the mkimage tool.
The gitlab CI passed, and I tested the SPI flash on the OrangePi Zero 3
and also booted that into Linux.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/sunxi_toc0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/sunxi_toc0.c b/tools/sunxi_toc0.c index 292649fe90f..76693647a09 100644 --- a/tools/sunxi_toc0.c +++ b/tools/sunxi_toc0.c @@ -444,7 +444,7 @@ static int toc0_verify_cert_item(const uint8_t *buf, uint32_t len, RSA *fw_key, /* If a digest was provided, compare it to the embedded digest. */ extension = &totalSequence->mainSequence.explicit3.extension; - if (digest && memcmp(&extension->digest, digest, SHA256_DIGEST_LENGTH)) { + if (memcmp(&extension->digest, digest, SHA256_DIGEST_LENGTH)) { pr_err("Wrong firmware digest in certificate\n"); goto err; } |