summaryrefslogtreecommitdiff
path: root/src/mainboard/lippert
diff options
context:
space:
mode:
authorMike Banon <mikebdp2@gmail.com>2020-02-13 16:07:54 +0000
committerPatrick Georgi <pgeorgi@google.com>2020-02-24 13:57:07 +0000
commita185665de442be7ce6d498c9ae2359f938d173cf (patch)
treea90de9f5141bc7cb6997959793e36a040845ad3c /src/mainboard/lippert
parent0bed4c84cc73870bb9757fc5229d33032ff71b5b (diff)
downloadcoreboot-a185665de442be7ce6d498c9ae2359f938d173cf.tar.xz
mb/lippert/frontrunner-af: 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: I63dd15ade28acb06da8d320edc8ae1fd433aa0e0 Reviewed-on: https://review.coreboot.org/c/coreboot/+/38872 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/lippert')
-rw-r--r--src/mainboard/lippert/frontrunner-af/Kconfig4
-rw-r--r--src/mainboard/lippert/frontrunner-af/Kconfig.name4
-rw-r--r--src/mainboard/lippert/frontrunner-af/Makefile.inc2
-rw-r--r--src/mainboard/lippert/frontrunner-af/bootblock.c (renamed from src/mainboard/lippert/frontrunner-af/romstage.c)5
-rw-r--r--src/mainboard/lippert/frontrunner-af/dsdt.asl1
5 files changed, 6 insertions, 10 deletions
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 4a007bf394..92d77434f5 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 1939264bc4..2a8cba52ab 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 3ea57cd1e3..46a44d20ef 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-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/lippert/frontrunner-af/romstage.c b/src/mainboard/lippert/frontrunner-af/bootblock.c
index f8e6091af0..e0dddc20cc 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 07b50713c7..9fcc7aef03 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -1124,7 +1124,6 @@ DefinitionBlock (
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)