summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorMike Banon <mikebdp2@gmail.com>2020-02-13 16:05:35 +0000
committerPatrick Georgi <pgeorgi@google.com>2020-02-24 13:55:59 +0000
commit0dcbcd31918cd0dd7e4f1086649dfe4a04397633 (patch)
tree69d08063552aa9de3f8a2f412190ab71c584f244 /src/mainboard
parentbb45f38eb9d0ecc6f4a1d0ca37c8c52212360c56 (diff)
downloadcoreboot-0dcbcd31918cd0dd7e4f1086649dfe4a04397633.tar.xz
mb/amd/south_station: 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: Iba1d020b9e565e3c6c89a97114084d72a00b2a55 Reviewed-on: https://review.coreboot.org/c/coreboot/+/38871 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/amd/south_station/Kconfig4
-rw-r--r--src/mainboard/amd/south_station/Kconfig.name4
-rw-r--r--src/mainboard/amd/south_station/Makefile.inc2
-rw-r--r--src/mainboard/amd/south_station/bootblock.c (renamed from src/mainboard/amd/south_station/romstage.c)6
4 files changed, 6 insertions, 10 deletions
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index 42841cbb93..a059403c7b 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -13,14 +13,10 @@
# GNU General Public License for more details.
#
-config BOARD_AMD_SOUTHSTATION
- def_bool n
-
if BOARD_AMD_SOUTHSTATION
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/south_station/Kconfig.name b/src/mainboard/amd/south_station/Kconfig.name
index f8f1404af2..0cc745e3bc 100644
--- a/src/mainboard/amd/south_station/Kconfig.name
+++ b/src/mainboard/amd/south_station/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_AMD_SOUTHSTATION
-# bool"Southstation"
+config BOARD_AMD_SOUTHSTATION
+ bool "Southstation"
diff --git a/src/mainboard/amd/south_station/Makefile.inc b/src/mainboard/amd/south_station/Makefile.inc
index 440744c479..ffea060d80 100644
--- a/src/mainboard/amd/south_station/Makefile.inc
+++ b/src/mainboard/amd/south_station/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/south_station/romstage.c b/src/mainboard/amd/south_station/bootblock.c
index 7ccf1674d7..6cd9e2a59a 100644
--- a/src/mainboard/amd/south_station/romstage.c
+++ b/src/mainboard/amd/south_station/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);
}