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

diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index ae024dd91f..820d43ebf6 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -13,14 +13,10 @@
 # GNU General Public License for more details.
 #
 
-config BOARD_AMD_PARMER
-	def_bool n
-
 if BOARD_AMD_PARMER
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	#select ROMCC_BOOTBLOCK
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/amd/parmer/Kconfig.name b/src/mainboard/amd/parmer/Kconfig.name
index 07714686dd..3aedc956ae 100644
--- a/src/mainboard/amd/parmer/Kconfig.name
+++ b/src/mainboard/amd/parmer/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_AMD_PARMER
-#	bool"Parmer"
+config BOARD_AMD_PARMER
+	bool "Parmer"
diff --git a/src/mainboard/amd/parmer/Makefile.inc b/src/mainboard/amd/parmer/Makefile.inc
index f8895faa92..4dde2cfd1e 100644
--- a/src/mainboard/amd/parmer/Makefile.inc
+++ b/src/mainboard/amd/parmer/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/parmer/romstage.c b/src/mainboard/amd/parmer/bootblock.c
similarity index 68%
rename from src/mainboard/amd/parmer/romstage.c
rename to src/mainboard/amd/parmer/bootblock.c
index 6366c4e348..fea4d7b632 100644
--- a/src/mainboard/amd/parmer/romstage.c
+++ b/src/mainboard/amd/parmer/bootblock.c
@@ -13,14 +13,9 @@
  * GNU General Public License for more details.
  */
 
+#include <bootblock_common.h>
 #include <device/pci_ops.h>
-#include <northbridge/amd/agesa/state_machine.h>
-#include <southbridge/amd/agesa/hudson/hudson.h>
 
-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
 {
-	pci_devfn_t dev = PCI_DEV(0, 0x14, 3);
-
-	/* For serial port option, plug-in card on LPC. */
-	pci_write_config32(dev, 0x44, 0xff03ffd5);
 }