From 541498be0a1921ee62b96bd07bc38af584c1e06e Mon Sep 17 00:00:00 2001
From: Mike Banon <mikebdp2@gmail.com>
Date: Thu, 13 Feb 2020 16:02:50 +0000
Subject: [PATCH] mb/elmex/pcm20540*: 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: I53b80fe97370c99968f073dfad61b5e5709e4ab6
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38870
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/elmex/pcm205400/Kconfig                     | 4 ----
 src/mainboard/elmex/pcm205400/Kconfig.name                | 4 ++--
 src/mainboard/elmex/pcm205400/Makefile.inc                | 2 ++
 src/mainboard/elmex/pcm205400/{romstage.c => bootblock.c} | 6 ++----
 src/mainboard/elmex/pcm205401/Kconfig                     | 3 ---
 src/mainboard/elmex/pcm205401/Kconfig.name                | 4 ++--
 6 files changed, 8 insertions(+), 15 deletions(-)
 rename src/mainboard/elmex/pcm205400/{romstage.c => bootblock.c} (85%)

diff --git a/src/mainboard/elmex/pcm205400/Kconfig b/src/mainboard/elmex/pcm205400/Kconfig
index e94a6d89bb..7dc67d17ea 100644
--- a/src/mainboard/elmex/pcm205400/Kconfig
+++ b/src/mainboard/elmex/pcm205400/Kconfig
@@ -13,9 +13,6 @@
 # GNU General Public License for more details.
 #
 
-config BOARD_ELMEX_PCM205400
-	def_bool n
-
 if BOARD_ELMEX_PCM205400
 
 config MAINBOARD_PART_NUMBER
@@ -32,7 +29,6 @@ if BOARD_ELMEX_PCM205400 || BOARD_ELMEX_PCM205401
 
 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/elmex/pcm205400/Kconfig.name b/src/mainboard/elmex/pcm205400/Kconfig.name
index 6488992de2..445b58868a 100644
--- a/src/mainboard/elmex/pcm205400/Kconfig.name
+++ b/src/mainboard/elmex/pcm205400/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_ELMEX_PCM205400
-#	bool"pcm205400"
+config BOARD_ELMEX_PCM205400
+	bool "pcm205400"
diff --git a/src/mainboard/elmex/pcm205400/Makefile.inc b/src/mainboard/elmex/pcm205400/Makefile.inc
index ba56286636..bf86007cec 100644
--- a/src/mainboard/elmex/pcm205400/Makefile.inc
+++ b/src/mainboard/elmex/pcm205400/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/elmex/pcm205400/romstage.c b/src/mainboard/elmex/pcm205400/bootblock.c
similarity index 85%
rename from src/mainboard/elmex/pcm205400/romstage.c
rename to src/mainboard/elmex/pcm205400/bootblock.c
index 7ccf1674d7..6cd9e2a59a 100644
--- a/src/mainboard/elmex/pcm205400/romstage.c
+++ b/src/mainboard/elmex/pcm205400/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);
 }
diff --git a/src/mainboard/elmex/pcm205401/Kconfig b/src/mainboard/elmex/pcm205401/Kconfig
index 15c741abf2..a9bbe6e471 100644
--- a/src/mainboard/elmex/pcm205401/Kconfig
+++ b/src/mainboard/elmex/pcm205401/Kconfig
@@ -13,9 +13,6 @@
 # GNU General Public License for more details.
 #
 
-config BOARD_ELMEX_PCM205401
-	def_bool n
-
 if BOARD_ELMEX_PCM205401
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/elmex/pcm205401/Kconfig.name b/src/mainboard/elmex/pcm205401/Kconfig.name
index 050b94c4b4..f70b215abc 100644
--- a/src/mainboard/elmex/pcm205401/Kconfig.name
+++ b/src/mainboard/elmex/pcm205401/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_ELMEX_PCM205401
-#	bool "pcm205401"
+config BOARD_ELMEX_PCM205401
+	bool "pcm205401"