[coreboot-gerrit] Change in coreboot[master]: [Try] mb/amd/union_station: Switch away from ROMCC_BOOTBLOCK

[HAOUAS Elyes (Code Review)]

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

Change subject: [Try] mb/amd/union_station: Switch away from ROMCC_BOOTBLOCK
......................................................................

[Try] mb/amd/union_station: Switch away from ROMCC_BOOTBLOCK

Untested.

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/37749/1

diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index f03fb08..72881b8 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/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/amd/union_station/Makefile.inc b/src/mainboard/amd/union_station/Makefile.inc
index 440744c..ffea060 100644
--- a/src/mainboard/amd/union_station/Makefile.inc
+++ b/src/mainboard/amd/union_station/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/amd/union_station/romstage.c b/src/mainboard/amd/union_station/bootblock.c
similarity index 80%
rename from src/mainboard/amd/union_station/romstage.c
rename to src/mainboard/amd/union_station/bootblock.c
index af64ad8..f0361d6 100644
--- a/src/mainboard/amd/union_station/romstage.c
+++ b/src/mainboard/amd/union_station/bootblock.c
@@ -13,10 +13,8 @@
  * GNU General Public License for more details.
  */

-#include <northbridge/amd/agesa/state_machine.h>
-#include <sb_cimx.h>
+#include <bootblock_common.h>

-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
 {
-	sb_Poweron_Init();
 }