[coreboot-gerrit] Change in coreboot[master]: [WIP] asrock/e350m1: Switch away from ROMCC_BOOTBLOCK

[Denis 'GNUtoo' Carikli (Code Review)]

Denis 'GNUtoo' Carikli has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37703 )

Change subject: [WIP] asrock/e350m1: Switch away from ROMCC_BOOTBLOCK
......................................................................

[WIP] asrock/e350m1: Switch away from ROMCC_BOOTBLOCK

Change-Id: Ie14db10b6a72e19ac67254ca8f95bcf6ac8af8d3
Signed-off-by: Denis 'GNUtoo' Carikli 
---
M src/mainboard/asrock/e350m1/Kconfig
M src/mainboard/asrock/e350m1/Makefile.inc
R src/mainboard/asrock/e350m1/bootblock.c
3 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/37703/1

diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index 86eaac8..3bbc2a5 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/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/asrock/e350m1/Makefile.inc b/src/mainboard/asrock/e350m1/Makefile.inc
index 440744c..ffea060 100644
--- a/src/mainboard/asrock/e350m1/Makefile.inc
+++ b/src/mainboard/asrock/e350m1/Makefile.inc
@@ -13,6 +13,8 @@
 # GNU General Public License for more details.
 #

+bootblock-y += bootblock.c
+
 romstage-y += buildOpts.c
 romstage-y += BiosCallOuts.c
 romstage-y += OemCustomize.c
diff --git a/src/mainboard/asrock/e350m1/romstage.c b/src/mainboard/asrock/e350m1/bootblock.c
similarity index 89%
rename from src/mainboard/asrock/e350m1/romstage.c
rename to src/mainboard/asrock/e350m1/bootblock.c
index 27a1fac..bdc8c6c 100644
--- a/src/mainboard/asrock/e350m1/romstage.c
+++ b/src/mainboard/asrock/e350m1/bootblock.c
@@ -13,15 +13,14 @@
  * GNU General Public License for more details.
  */

-#include <northbridge/amd/agesa/state_machine.h>
+#include <bootblock_common.h>
 #include <superio/nuvoton/common/nuvoton.h>
 #include <superio/nuvoton/nct5572d/nct5572d.h>
 #include <sb_cimx.h>

#define SERIAL_DEV PNP_DEV(0x2e, NCT5572D_SP1)

-
-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
 {
    sb_Poweron_Init();
    nuvoton_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);