Angel Pons submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
s25f.c: Fix mismatched function definitions

This was missed because `uint32_t` is `unsigned int` in most cases.
However, it is not the case for DJGPP 6.1.0 for some reason.

Tested with manibuilder, solves some build errors on the DJGPP target.

Change-Id: I656a72b85d4c70b57f6ff9268186a4a60933f8a9
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52473
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M s25f.c
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/s25f.c b/s25f.c
index 32af53e..2fba6bc 100644
--- a/s25f.c
+++ b/s25f.c
@@ -237,8 +237,7 @@
return ret;
}

-int s25fs_block_erase_d8(struct flashctx *flash,
- uint32_t addr, uint32_t blocklen)
+int s25fs_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen)
{
static int cr3nv_checked = 0;

@@ -301,8 +300,7 @@
return s25f_poll_status(flash);
}

-int s25fl_block_erase(struct flashctx *flash,
- uint32_t addr, uint32_t blocklen)
+int s25fl_block_erase(struct flashctx *flash, unsigned int addr, unsigned int blocklen)
{
struct spi_command erase_cmds[] = {
{

To view, visit change 52473. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I656a72b85d4c70b57f6ff9268186a4a60933f8a9
Gerrit-Change-Number: 52473
Gerrit-PatchSet: 3
Gerrit-Owner: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@mailbox.org>
Gerrit-MessageType: merged