[coreboot-gerrit] Change in coreboot[master]: [try] mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37746 )

Change subject: [try] mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK
......................................................................

[try] mb/lippert/toucan-af: Switch away from ROMCC_BOOTBLOCK

Untested.

Change-Id: I4a6b82deffe6026f5562429221c2d042af825707
Signed-off-by: Elyes HAOUAS 
---
M src/mainboard/lippert/toucan-af/Kconfig
M src/mainboard/lippert/toucan-af/Makefile.inc
R src/mainboard/lippert/toucan-af/bootblock.c
3 files changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/37746/1

diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 146af07..74b335a 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -17,7 +17,6 @@

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/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..72eaec6 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(struct sysinfo *cb)
 {
-	sb_Poweron_Init();
    winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }