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

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37751 )

Change subject: [Try] mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK
......................................................................

[Try] mb/amd/inagua: Switch away from ROMCC_BOOTBLOCK

Untested.

Change-Id: Id5aa53786bc244af8af42de3e85ceb029494cddc
Signed-off-by: Elyes HAOUAS 
---
M src/mainboard/amd/inagua/Kconfig
M src/mainboard/amd/inagua/Makefile.inc
R src/mainboard/amd/inagua/bootblock.c
3 files changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/37751/1

diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 541868b..e24af40 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -17,7 +17,6 @@

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/inagua/Makefile.inc b/src/mainboard/amd/inagua/Makefile.inc
index ba56286..bf86007 100644
--- a/src/mainboard/amd/inagua/Makefile.inc
+++ b/src/mainboard/amd/inagua/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/inagua/romstage.c b/src/mainboard/amd/inagua/bootblock.c
similarity index 84%
rename from src/mainboard/amd/inagua/romstage.c
rename to src/mainboard/amd/inagua/bootblock.c
index 43d9da9..78d8fca 100644
--- a/src/mainboard/amd/inagua/romstage.c
+++ b/src/mainboard/amd/inagua/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/smsc/kbc1100/kbc1100.h>
-#include <sb_cimx.h>

#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1)

-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
 {
-	sb_Poweron_Init();
    kbc1100_early_init(0x2e);
    kbc1100_early_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }