[coreboot-gerrit] Change in coreboot[master]: mb/lippert/frontrunner-af: Switch away from ROMCC_BOOTBLOCK

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38872 )

Change subject: mb/lippert/frontrunner-af: Switch away from ROMCC_BOOTBLOCK
......................................................................

mb/lippert/frontrunner-af: Switch away from ROMCC_BOOTBLOCK

Warning: Not tested on hardware.

Signed-off-by: Elyes HAOUAS 
Signed-off-by: Mike Banon 
Change-Id: I63dd15ade28acb06da8d320edc8ae1fd433aa0e0
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38872
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Georgi 
---
M src/mainboard/lippert/frontrunner-af/Kconfig
M src/mainboard/lippert/frontrunner-af/Kconfig.name
M src/mainboard/lippert/frontrunner-af/Makefile.inc
R src/mainboard/lippert/frontrunner-af/bootblock.c
M src/mainboard/lippert/frontrunner-af/dsdt.asl
5 files changed, 6 insertions(+), 10 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved
  HAOUAS Elyes: Looks good to me, but someone else must approve

diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 4a007bf..92d7743 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -13,14 +13,10 @@
 # GNU General Public License for more details.
 #

-config BOARD_LIPPERT_FRONTRUNNER_AF
-	def_bool n
-
 if BOARD_LIPPERT_FRONTRUNNER_AF

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/lippert/frontrunner-af/Kconfig.name b/src/mainboard/lippert/frontrunner-af/Kconfig.name
index 1939264..2a8cba5 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig.name
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_LIPPERT_FRONTRUNNER_AF
-#	bool"FrontRunner-AF aka ADLINK CoreModule2-GF"
+config BOARD_LIPPERT_FRONTRUNNER_AF
+	bool "FrontRunner-AF aka ADLINK CoreModule2-GF"
diff --git a/src/mainboard/lippert/frontrunner-af/Makefile.inc b/src/mainboard/lippert/frontrunner-af/Makefile.inc
index 3ea57cd..46a44d2 100644
--- a/src/mainboard/lippert/frontrunner-af/Makefile.inc
+++ b/src/mainboard/lippert/frontrunner-af/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/lippert/frontrunner-af/romstage.c b/src/mainboard/lippert/frontrunner-af/bootblock.c
similarity index 89%
rename from src/mainboard/lippert/frontrunner-af/romstage.c
rename to src/mainboard/lippert/frontrunner-af/bootblock.c
index f8e6091..e0dddc2 100644
--- a/src/mainboard/lippert/frontrunner-af/romstage.c
+++ b/src/mainboard/lippert/frontrunner-af/bootblock.c
@@ -13,14 +13,13 @@
  * GNU General Public License for more details.
  */

+#include <bootblock_common.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include <superio/smsc/smscsuperio/smscsuperio.h>
-#include <sb_cimx.h>

#define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1)

-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
 {
-	sb_Poweron_Init();
    smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
 }
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index 07b5071..9fcc7ae 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -1124,7 +1124,6 @@
    		External (TOM2)
    		Name(_HID, EISAID("PNP0A08"))	/* PCI Express Root Bridge */
    		Name(_CID, EISAID("PNP0A03"))	/* PCI Root Bridge */
-			Name(_ADR, 0x00180000)	/* Dev# = BSP Dev#, Func# = 0 */

/* Operating System Capabilities Method */
    		Method (_OSC, 4)