summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2020-02-18 23:29:21 -0700
committerAngel Pons <th3fanbus@gmail.com>2020-04-18 19:07:41 +0000
commit069cd678546c9b433442e1dbeea46d3a5e923aa5 (patch)
tree1d6670a68c48c9860f6224ecaa0f43db68a97701
parent9e3e49234d30dadd5888b389ed572a2faac1c6af (diff)
downloadcoreboot-069cd678546c9b433442e1dbeea46d3a5e923aa5.tar.xz
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 <jgarber1@ualberta.ca> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39015 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: David Guckian Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/mainboard/intel/harcuvar/boardid.c2
-rw-r--r--src/mainboard/intel/harcuvar/harcuvar_boardid.h2
-rw-r--r--src/mainboard/intel/harcuvar/hsio.c2
-rw-r--r--src/mainboard/intel/harcuvar/romstage.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/intel/harcuvar/boardid.c b/src/mainboard/intel/harcuvar/boardid.c
index 8f91b0c61d..a9d9af630f 100644
--- a/src/mainboard/intel/harcuvar/boardid.c
+++ b/src/mainboard/intel/harcuvar/boardid.c
@@ -5,7 +5,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 28f28d9135..cb05090bc6 100644
--- a/src/mainboard/intel/harcuvar/harcuvar_boardid.h
+++ b/src/mainboard/intel/harcuvar/harcuvar_boardid.h
@@ -8,6 +8,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 d786b8fb2e..948f3263fc 100644
--- a/src/mainboard/intel/harcuvar/hsio.c
+++ b/src/mainboard/intel/harcuvar/hsio.c
@@ -7,7 +7,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 a5c13277f1..542f81e005 100644
--- a/src/mainboard/intel/harcuvar/romstage.c
+++ b/src/mainboard/intel/harcuvar/romstage.c
@@ -88,7 +88,7 @@ void mainboard_config_gpios(void)
{
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.