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

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38875 )

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

mb/amd/union_station: Switch away from ROMCC_BOOTBLOCK

Warning: Not tested on hardware.

Signed-off-by: Elyes HAOUAS 
Signed-off-by: Mike Banon 
Change-Id: I0edfc7bb6d01eb1a12299fddd3d3ac45b43edfdb
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38875
Reviewed-by: Patrick Georgi 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/amd/union_station/Kconfig
M src/mainboard/amd/union_station/Kconfig.name
M src/mainboard/amd/union_station/Makefile.inc
R src/mainboard/amd/union_station/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/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 1532d34..72881b8 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -13,14 +13,10 @@
 # GNU General Public License for more details.
 #

-config BOARD_AMD_UNIONSTATION
-	def_bool n
-
 if BOARD_AMD_UNIONSTATION

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/Kconfig.name b/src/mainboard/amd/union_station/Kconfig.name
index b4dc5365..9af3c82 100644
--- a/src/mainboard/amd/union_station/Kconfig.name
+++ b/src/mainboard/amd/union_station/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_AMD_UNIONSTATION
-#	bool"Unionstation"
+config BOARD_AMD_UNIONSTATION
+	bool "Unionstation"
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();
 }