UPSTREAM: amdfwtool: Fix the gcc warning about sign comparison
New (maybe) compile tool complains the warning below.
warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
Fix all of them.
BUG=none
BRANCH=none
TEST=none
Change-Id: I731a234c383aa40040f396465a0714196f1b2e8f
Signed-off-by: Martin Roth <gaumless@gmail.com>
Original-Commit-Id: 6d402acbc0278d07a088dd3c7870f15ad1c2691a
Original-Change-Id: I59624326233284e6c3595df49625563254949c45
Original-Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/45893
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Original-Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2446610
Reviewed-by: Martin Roth <martinroth@google.com>
Tested-by: Martin Roth <martinroth@google.com>
Commit-Queue: Martin Roth <martinroth@google.com>
diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index f385068..e6341a7 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -646,7 +646,7 @@
return -2;
}
- if (fd_stat.st_size > room) {
+ if ((size_t)fd_stat.st_size > room) {
printf("Error: %s will not fit. Exiting.\n", src_file);
close(fd);
return -3;
@@ -667,7 +667,7 @@
amd_fw_entry *fw_table)
{
ssize_t bytes;
- int i;
+ uint32_t i;
ctx->current += sizeof(embedded_firmware);
ctx->current = ALIGN(ctx->current, BLOB_ALIGNMENT);
@@ -841,7 +841,7 @@
static int locate_bdt2_bios(bios_directory_table *level2,
uint64_t *source, uint32_t *size)
{
- int i;
+ uint32_t i;
*source = 0;
*size = 0;
@@ -1154,7 +1154,7 @@
static void register_fw_fuse(char *str)
{
- int i;
+ uint32_t i;
for (i = 0; i < sizeof(amd_psp_fw_table) / sizeof(amd_fw_entry); i++) {
if (amd_psp_fw_table[i].type != AMD_PSP_FUSE_CHAIN)
@@ -1167,7 +1167,7 @@
static void register_fw_token_unlock(void)
{
- int i;
+ uint32_t i;
for (i = 0; i < sizeof(amd_psp_fw_table) / sizeof(amd_fw_entry); i++) {
if (amd_psp_fw_table[i].type != AMD_TOKEN_UNLOCK)
@@ -1202,7 +1202,7 @@
static void register_bdt_data(amd_bios_type type, int sub, int ins, char name[])
{
- int i;
+ uint32_t i;
for (i = 0; i < sizeof(amd_bios_table) / sizeof(amd_bios_entry); i++) {
if (amd_bios_table[i].type == type
@@ -1217,7 +1217,7 @@
static void register_fw_addr(amd_bios_type type, char *src_str,
char *dst_str, char *size_str)
{
- int i;
+ uint32_t i;
for (i = 0; i < sizeof(amd_bios_table) / sizeof(amd_bios_entry); i++) {
if (amd_bios_table[i].type != type)
continue;
