Change in coreboot[master]: [TESTME]mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK
Hello HAOUAS Elyes,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/38878
to review the following change.
Change subject: [TESTME]mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK ......................................................................
[TESTME]mb/lippert/toucan-af: 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: I22774a6d6a32c2fb8340f5ac678befe0d5f8ad75 --- M src/mainboard/lippert/toucan-af/Kconfig M src/mainboard/lippert/toucan-af/Kconfig.name M src/mainboard/lippert/toucan-af/Makefile.inc R src/mainboard/lippert/toucan-af/bootblock.c 4 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/38878/1
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index b62da2e..74b335a 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -13,14 +13,10 @@ # GNU General Public License for more details. #
-config BOARD_LIPPERT_TOUCAN_AF - def_bool n - if BOARD_LIPPERT_TOUCAN_AF
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/lippert/toucan-af/Kconfig.name b/src/mainboard/lippert/toucan-af/Kconfig.name index 6eceb51..3481f92 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig.name +++ b/src/mainboard/lippert/toucan-af/Kconfig.name @@ -1,2 +1,2 @@ -#config BOARD_LIPPERT_TOUCAN_AF -# bool"Toucan-AF aka cExpress-GFR (+W83627DHG SIO)" +config BOARD_LIPPERT_TOUCAN_AF + bool "Toucan-AF aka cExpress-GFR (+W83627DHG SIO)" diff --git a/src/mainboard/lippert/toucan-af/Makefile.inc b/src/mainboard/lippert/toucan-af/Makefile.inc index 1080c64..7e4f280 100644 --- a/src/mainboard/lippert/toucan-af/Makefile.inc +++ b/src/mainboard/lippert/toucan-af/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/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/bootblock.c similarity index 84% rename from src/mainboard/lippert/toucan-af/romstage.c rename to src/mainboard/lippert/toucan-af/bootblock.c index ebbe4fc..39b108e 100644 --- a/src/mainboard/lippert/toucan-af/romstage.c +++ b/src/mainboard/lippert/toucan-af/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/winbond/common/winbond.h> #include <superio/winbond/w83627dhg/w83627dhg.h> -#include <sb_cimx.h>
#define SERIAL_DEV PNP_DEV(0x4e, W83627DHG_SP1)
-void board_BeforeAgesa(struct sysinfo *cb) +void bootblock_mainboard_early_init(void) { - sb_Poweron_Init(); winbond_enable_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/+/38878
to look at the new patch set (#4).
Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/lippert/toucan-af: 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: I22774a6d6a32c2fb8340f5ac678befe0d5f8ad75 --- M src/mainboard/lippert/toucan-af/Kconfig M src/mainboard/lippert/toucan-af/Kconfig.name M src/mainboard/lippert/toucan-af/Makefile.inc R src/mainboard/lippert/toucan-af/bootblock.c 4 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/38878/4
HAOUAS Elyes has uploaded a new patch set (#7) to the change originally created by Mike Banon. ( https://review.coreboot.org/c/coreboot/+/38878 )
Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/lippert/toucan-af: 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: I22774a6d6a32c2fb8340f5ac678befe0d5f8ad75 --- M src/mainboard/lippert/toucan-af/Kconfig M src/mainboard/lippert/toucan-af/Kconfig.name M src/mainboard/lippert/toucan-af/Makefile.inc R src/mainboard/lippert/toucan-af/bootblock.c M src/mainboard/lippert/toucan-af/dsdt.asl 5 files changed, 6 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/78/38878/7
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38878 )
Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 7: Code-Review+1
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38878 )
Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK ......................................................................
Patch Set 7: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38878 )
Change subject: mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK ......................................................................
mb/lippert/toucan-af: 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: I22774a6d6a32c2fb8340f5ac678befe0d5f8ad75 Reviewed-on: https://review.coreboot.org/c/coreboot/+/38878 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- M src/mainboard/lippert/toucan-af/Kconfig M src/mainboard/lippert/toucan-af/Kconfig.name M src/mainboard/lippert/toucan-af/Makefile.inc R src/mainboard/lippert/toucan-af/bootblock.c M src/mainboard/lippert/toucan-af/dsdt.asl 5 files changed, 6 insertions(+), 11 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/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig index b62da2e..74b335a 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig +++ b/src/mainboard/lippert/toucan-af/Kconfig @@ -13,14 +13,10 @@ # GNU General Public License for more details. #
-config BOARD_LIPPERT_TOUCAN_AF - def_bool n - if BOARD_LIPPERT_TOUCAN_AF
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/lippert/toucan-af/Kconfig.name b/src/mainboard/lippert/toucan-af/Kconfig.name index 6eceb51..3481f92 100644 --- a/src/mainboard/lippert/toucan-af/Kconfig.name +++ b/src/mainboard/lippert/toucan-af/Kconfig.name @@ -1,2 +1,2 @@ -#config BOARD_LIPPERT_TOUCAN_AF -# bool"Toucan-AF aka cExpress-GFR (+W83627DHG SIO)" +config BOARD_LIPPERT_TOUCAN_AF + bool "Toucan-AF aka cExpress-GFR (+W83627DHG SIO)" diff --git a/src/mainboard/lippert/toucan-af/Makefile.inc b/src/mainboard/lippert/toucan-af/Makefile.inc index 1080c64..7e4f280 100644 --- a/src/mainboard/lippert/toucan-af/Makefile.inc +++ b/src/mainboard/lippert/toucan-af/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/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/bootblock.c similarity index 84% rename from src/mainboard/lippert/toucan-af/romstage.c rename to src/mainboard/lippert/toucan-af/bootblock.c index ebbe4fc..39b108e 100644 --- a/src/mainboard/lippert/toucan-af/romstage.c +++ b/src/mainboard/lippert/toucan-af/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/winbond/common/winbond.h> #include <superio/winbond/w83627dhg/w83627dhg.h> -#include <sb_cimx.h>
#define SERIAL_DEV PNP_DEV(0x4e, W83627DHG_SP1)
-void board_BeforeAgesa(struct sysinfo *cb) +void bootblock_mainboard_early_init(void) { - sb_Poweron_Init(); winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); } diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl index 347f1a1..4e36c2b 100644 --- a/src/mainboard/lippert/toucan-af/dsdt.asl +++ b/src/mainboard/lippert/toucan-af/dsdt.asl @@ -1123,7 +1123,6 @@ External (TOM2) Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */ Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */ - Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */
/* Operating System Capabilities Method */ Method (_OSC, 4)
-
HAOUAS Elyes (Code Review) -
Mike Banon (Code Review)
-
Patrick Georgi (Code Review)