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 jgarber1@ualberta.ca --- 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.
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39015/1/src/mainboard/intel/harcuva... File src/mainboard/intel/harcuvar/hsio.c:
https://review.coreboot.org/c/coreboot/+/39015/1/src/mainboard/intel/harcuva... PS1, Line 23: uint32_t boardid = board_id(); please, no spaces at the start of a line
David Guckian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1: Code-Review+1
Thanks for the update
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1: Code-Review+1
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39015/1/src/mainboard/intel/harcuva... File src/mainboard/intel/harcuvar/hsio.c:
PS1: David, could you please fix up the file to use tabs in a follow-up?
David Guckian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39015/1/src/mainboard/intel/harcuva... File src/mainboard/intel/harcuvar/hsio.c:
PS1:
David, could you please fix up the file to use tabs in a follow-up?
We'll do that Paul
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1: Code-Review+1
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/39015/1/src/mainboard/intel/harcuva... File src/mainboard/intel/harcuvar/hsio.c:
PS1:
We'll do that Paul
Ack (marking as resolved so as to not block the change)
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 1:
Could you please rebase this on master?
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39015/2/src/mainboard/intel/harcuva... File src/mainboard/intel/harcuvar/hsio.c:
https://review.coreboot.org/c/coreboot/+/39015/2/src/mainboard/intel/harcuva... PS2, Line 10: uint32_t boardid = board_id(); please, no spaces at the start of a line
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39015/3/src/mainboard/intel/harcuva... File src/mainboard/intel/harcuvar/hsio.c:
https://review.coreboot.org/c/coreboot/+/39015/3/src/mainboard/intel/harcuva... PS3, Line 10: uint32_t boardid = board_id(); please, no spaces at the start of a line
Angel Pons has submitted this change. ( 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 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 --- 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(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve HAOUAS Elyes: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved David Guckian: Looks good to me, but someone else must approve
diff --git a/src/mainboard/intel/harcuvar/boardid.c b/src/mainboard/intel/harcuvar/boardid.c index 8f91b0c..a9d9af6 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 28f28d9..cb05090 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 d786b8f..948f326 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 a5c1327..542f81e 100644 --- a/src/mainboard/intel/harcuvar/romstage.c +++ b/src/mainboard/intel/harcuvar/romstage.c @@ -88,7 +88,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.
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39015 )
Change subject: mb/intel/harcuvar: Fix board_id() return type ......................................................................
Patch Set 4:
Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/2460 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2459 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/2458 EMULATION_QEMU_AARCH64_FIT_SUPPORT_TIMESTAMPS using payload LinuxBoot_u-root_kexec_AARCH64 : SUCCESS : https://lava.9esec.io/r/2457
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Angel Pons (Code Review)
-
build bot (Jenkins) (Code Review)
-
David Guckian (Code Review)
-
HAOUAS Elyes (Code Review)
-
Jacob Garber (Code Review)
-
Paul Menzel (Code Review)