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

[Mike Banon (Code Review)]

Hello HAOUAS Elyes,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/38873

to review the following change.

Change subject: [TESTME]mb/amd/persimmon: Switch away from ROMCC_BOOTBLOCK
......................................................................

[TESTME]mb/amd/persimmon: Switch away from ROMCC_BOOTBLOCK

Warning: Not tested on hardware.

Signed-off-by: Elyes HAOUAS 
Signed-off-by: Mike Banon 
Change-Id: I51d42f137fa539225bca5631bec38144ffd4f1d5
---
M src/mainboard/amd/persimmon/Kconfig
M src/mainboard/amd/persimmon/Kconfig.name
M src/mainboard/amd/persimmon/Makefile.inc
R src/mainboard/amd/persimmon/bootblock.c
4 files changed, 6 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/73/38873/1

diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index f243f0f..41bf3c9 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 d50ebbe..ba24b13a 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 ba56286..bf86007 100644
--- a/src/mainboard/amd/persimmon/Makefile.inc
+++ b/src/mainboard/amd/persimmon/Makefile.inc
@@ -20,6 +20,8 @@
 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 84%
rename from src/mainboard/amd/persimmon/romstage.c
rename to src/mainboard/amd/persimmon/bootblock.c
index 7ccf167..6cd9e2a 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);
 }