Hello HAOUAS Elyes,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/38876
to review the following change.
Change subject: [TESTME]mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK ......................................................................
[TESTME]mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK
Warning: Not tested on hardware.
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I55bf3004c728bb42ee51dfa917c58d97c56502cd --- M src/mainboard/amd/inagua/Kconfig M src/mainboard/amd/inagua/Kconfig.name M src/mainboard/amd/inagua/Makefile.inc R src/mainboard/amd/inagua/bootblock.c 4 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/38876/1
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index a5ba07e..e24af40 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -13,14 +13,10 @@ # GNU General Public License for more details. #
-config BOARD_AMD_INAGUA - def_bool n - if BOARD_AMD_INAGUA
config BOARD_SPECIFIC_OPTIONS def_bool y - #select ROMCC_BOOTBLOCK select CPU_AMD_AGESA_FAMILY14 select NORTHBRIDGE_AMD_AGESA_FAMILY14 select SOUTHBRIDGE_AMD_CIMX_SB800 diff --git a/src/mainboard/amd/inagua/Kconfig.name b/src/mainboard/amd/inagua/Kconfig.name index 1784fe6..668b22a 100644 --- a/src/mainboard/amd/inagua/Kconfig.name +++ b/src/mainboard/amd/inagua/Kconfig.name @@ -1,2 +1,2 @@ -#config BOARD_AMD_INAGUA -# bool"Inagua" +config BOARD_AMD_INAGUA + bool "Inagua" diff --git a/src/mainboard/amd/inagua/Makefile.inc b/src/mainboard/amd/inagua/Makefile.inc index ba56286..bf86007 100644 --- a/src/mainboard/amd/inagua/Makefile.inc +++ b/src/mainboard/amd/inagua/Makefile.inc @@ -20,6 +20,8 @@ pci$(stripped_ahcibios_id).rom-type := optionrom endif
+bootblock-y += bootblock.c + romstage-y += buildOpts.c romstage-y += BiosCallOuts.c romstage-y += OemCustomize.c diff --git a/src/mainboard/amd/inagua/romstage.c b/src/mainboard/amd/inagua/bootblock.c similarity index 84% rename from src/mainboard/amd/inagua/romstage.c rename to src/mainboard/amd/inagua/bootblock.c index 43d9da9..78d8fca 100644 --- a/src/mainboard/amd/inagua/romstage.c +++ b/src/mainboard/amd/inagua/bootblock.c @@ -13,15 +13,13 @@ * GNU General Public License for more details. */
-#include <northbridge/amd/agesa/state_machine.h> +#include <bootblock_common.h> #include <superio/smsc/kbc1100/kbc1100.h> -#include <sb_cimx.h>
#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1)
-void board_BeforeAgesa(struct sysinfo *cb) +void bootblock_mainboard_early_init(void) { - sb_Poweron_Init(); kbc1100_early_init(0x2e); kbc1100_early_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); }
Hello HAOUAS Elyes, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38876
to look at the new patch set (#4).
Change subject: mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK
Warning: Not tested on hardware.
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I55bf3004c728bb42ee51dfa917c58d97c56502cd --- M src/mainboard/amd/inagua/Kconfig M src/mainboard/amd/inagua/Kconfig.name M src/mainboard/amd/inagua/Makefile.inc R src/mainboard/amd/inagua/bootblock.c 4 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/38876/4
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38876 )
Change subject: mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 4: Code-Review+1
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38876 )
Change subject: mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 4: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38876 )
Change subject: mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK
Warning: Not tested on hardware.
Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Signed-off-by: Mike Banon mikebdp2@gmail.com Change-Id: I55bf3004c728bb42ee51dfa917c58d97c56502cd Reviewed-on: https://review.coreboot.org/c/coreboot/+/38876 Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/amd/inagua/Kconfig M src/mainboard/amd/inagua/Kconfig.name M src/mainboard/amd/inagua/Makefile.inc R src/mainboard/amd/inagua/bootblock.c 4 files changed, 6 insertions(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved HAOUAS Elyes: Looks good to me, but someone else must approve
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index a5ba07e..e24af40 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -13,14 +13,10 @@ # GNU General Public License for more details. #
-config BOARD_AMD_INAGUA - def_bool n - if BOARD_AMD_INAGUA
config BOARD_SPECIFIC_OPTIONS def_bool y - #select ROMCC_BOOTBLOCK select CPU_AMD_AGESA_FAMILY14 select NORTHBRIDGE_AMD_AGESA_FAMILY14 select SOUTHBRIDGE_AMD_CIMX_SB800 diff --git a/src/mainboard/amd/inagua/Kconfig.name b/src/mainboard/amd/inagua/Kconfig.name index 1784fe6..668b22a 100644 --- a/src/mainboard/amd/inagua/Kconfig.name +++ b/src/mainboard/amd/inagua/Kconfig.name @@ -1,2 +1,2 @@ -#config BOARD_AMD_INAGUA -# bool"Inagua" +config BOARD_AMD_INAGUA + bool "Inagua" diff --git a/src/mainboard/amd/inagua/Makefile.inc b/src/mainboard/amd/inagua/Makefile.inc index ba56286..bf86007 100644 --- a/src/mainboard/amd/inagua/Makefile.inc +++ b/src/mainboard/amd/inagua/Makefile.inc @@ -20,6 +20,8 @@ pci$(stripped_ahcibios_id).rom-type := optionrom endif
+bootblock-y += bootblock.c + romstage-y += buildOpts.c romstage-y += BiosCallOuts.c romstage-y += OemCustomize.c diff --git a/src/mainboard/amd/inagua/romstage.c b/src/mainboard/amd/inagua/bootblock.c similarity index 84% rename from src/mainboard/amd/inagua/romstage.c rename to src/mainboard/amd/inagua/bootblock.c index 43d9da9..78d8fca 100644 --- a/src/mainboard/amd/inagua/romstage.c +++ b/src/mainboard/amd/inagua/bootblock.c @@ -13,15 +13,13 @@ * GNU General Public License for more details. */
-#include <northbridge/amd/agesa/state_machine.h> +#include <bootblock_common.h> #include <superio/smsc/kbc1100/kbc1100.h> -#include <sb_cimx.h>
#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1)
-void board_BeforeAgesa(struct sysinfo *cb) +void bootblock_mainboard_early_init(void) { - sb_Poweron_Init(); kbc1100_early_init(0x2e); kbc1100_early_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); }
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38876 )
Change subject: mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 5:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/797 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/796 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/795
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
HAOUAS Elyes (Code Review)
-
Mike Banon (Code Review)
-
Patrick Georgi (Code Review)