[coreboot-gerrit] Change in coreboot[master]: mb/intel/harcuvar: Fix board_id() return type

[Jacob Garber (Code Review)]

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39015 )

Change subject: mb/intel/harcuvar: Fix board_id() return type
......................................................................

mb/intel/harcuvar: Fix board_id() return type

The weak definition of board_id() in coreboot_table.c returns a
uint32_t, so update this function to match. This fixes a compiler error
when using LTO.

Change-Id: I6ad03ecedcf4a4d9f0c917cdc760f81ddde06d11
Signed-off-by: Jacob Garber 
---
M src/mainboard/intel/harcuvar/boardid.c
M src/mainboard/intel/harcuvar/harcuvar_boardid.h
M src/mainboard/intel/harcuvar/hsio.c
M src/mainboard/intel/harcuvar/romstage.c
4 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/39015/1

diff --git a/src/mainboard/intel/harcuvar/boardid.c b/src/mainboard/intel/harcuvar/boardid.c
index 7edf364..5044f1a 100644
--- a/src/mainboard/intel/harcuvar/boardid.c
+++ b/src/mainboard/intel/harcuvar/boardid.c
@@ -18,7 +18,7 @@

#include "harcuvar_boardid.h"

-uint8_t board_id(void)
+uint32_t board_id(void)
 {
    int id = BoardIdHarcuvar;

diff --git a/src/mainboard/intel/harcuvar/harcuvar_boardid.h b/src/mainboard/intel/harcuvar/harcuvar_boardid.h
index 3bcd60c..10e03d9 100644
--- a/src/mainboard/intel/harcuvar/harcuvar_boardid.h
+++ b/src/mainboard/intel/harcuvar/harcuvar_boardid.h
@@ -21,6 +21,6 @@

#define BoardIdHarcuvar 0x52

-uint8_t board_id(void);
+uint32_t board_id(void);

#endif /* MAINBOARD_BOARD_H */
diff --git a/src/mainboard/intel/harcuvar/hsio.c b/src/mainboard/intel/harcuvar/hsio.c
index fa17130..a7b8811 100644
--- a/src/mainboard/intel/harcuvar/hsio.c
+++ b/src/mainboard/intel/harcuvar/hsio.c
@@ -20,7 +20,7 @@

size_t mainboard_get_hsio_config(BL_HSIO_INFORMATION **p_hsio_config)
 {
-    uint8_t boardid = board_id();
+    uint32_t boardid = board_id();
     size_t num;
     switch (boardid) {
     case BoardIdHarcuvar:
diff --git a/src/mainboard/intel/harcuvar/romstage.c b/src/mainboard/intel/harcuvar/romstage.c
index 53ecdec..179ff23 100644
--- a/src/mainboard/intel/harcuvar/romstage.c
+++ b/src/mainboard/intel/harcuvar/romstage.c
@@ -89,7 +89,7 @@
 {
    size_t num;
    const struct dnv_pad_config *table;
-	uint8_t boardid = board_id();
+	uint32_t boardid = board_id();

/* Configure pads prior to SiliconInit() in case there's any
    * dependencies during hardware initialization.