From 938ae2655f1ef076278c7327f343ae786e9a491c Mon Sep 17 00:00:00 2001
From: Mike Banon <mikebdp2@gmail.com>
Date: Thu, 13 Feb 2020 16:13:18 +0000
Subject: [PATCH] mb/amd/persimmon: 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: I51d42f137fa539225bca5631bec38144ffd4f1d5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38873
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/amd/persimmon/Kconfig                     | 4 ----
 src/mainboard/amd/persimmon/Kconfig.name                | 4 ++--
 src/mainboard/amd/persimmon/Makefile.inc                | 2 ++
 src/mainboard/amd/persimmon/{romstage.c => bootblock.c} | 6 ++----
 4 files changed, 6 insertions(+), 10 deletions(-)
 rename src/mainboard/amd/persimmon/{romstage.c => bootblock.c} (85%)

diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index f243f0f9c7..41bf3c9c2e 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -13,14 +13,10 @@
 # GNU General Public License for more details.
 #
 
-config BOARD_AMD_PERSIMMON
-	def_bool n
-
 if BOARD_AMD_PERSIMMON
 
 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/persimmon/Kconfig.name b/src/mainboard/amd/persimmon/Kconfig.name
index d50ebbe8cd..ba24b13aa4 100644
--- a/src/mainboard/amd/persimmon/Kconfig.name
+++ b/src/mainboard/amd/persimmon/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_AMD_PERSIMMON
-#	bool"Persimmon"
+config BOARD_AMD_PERSIMMON
+	bool "Persimmon"
diff --git a/src/mainboard/amd/persimmon/Makefile.inc b/src/mainboard/amd/persimmon/Makefile.inc
index ba56286636..bf86007cec 100644
--- a/src/mainboard/amd/persimmon/Makefile.inc
+++ b/src/mainboard/amd/persimmon/Makefile.inc
@@ -20,6 +20,8 @@ pci$(stripped_ahcibios_id).rom-file := $(call strip_quotes,$(CONFIG_AHCI_BIOS_FI
 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/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/bootblock.c
similarity index 85%
rename from src/mainboard/amd/persimmon/romstage.c
rename to src/mainboard/amd/persimmon/bootblock.c
index 7ccf1674d7..6cd9e2a59a 100644
--- a/src/mainboard/amd/persimmon/romstage.c
+++ b/src/mainboard/amd/persimmon/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/fintek/common/fintek.h>
 #include <superio/fintek/f81865f/f81865f.h>
-#include <sb_cimx.h>
 
 #define SERIAL_DEV PNP_DEV(0x4e, F81865F_SP1)
 
-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
 {
-	sb_Poweron_Init();
 	fintek_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }