mb/amd/union_station: 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: I0edfc7bb6d01eb1a12299fddd3d3ac45b43edfdb
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38875
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

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

src/mainboard/amd/union_station/Kconfig.name

@@ -1,2 +1,2 @@
-#config BOARD_AMD_UNIONSTATION
-#	bool"Unionstation"
+config BOARD_AMD_UNIONSTATION
+	bool "Unionstation"

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

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();
 }