summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Banon <mikebdp2@gmail.com>2020-02-13 16:18:27 +0000
committerPatrick Georgi <pgeorgi@google.com>2020-02-24 13:57:20 +0000
commitdddd5cca75520fda927f32acf3a3a8cb29ab3a41 (patch)
treebfe16f30151fde31ffce93a98d58fa2dfdadbabb
parenta185665de442be7ce6d498c9ae2359f938d173cf (diff)
downloadcoreboot-dddd5cca75520fda927f32acf3a3a8cb29ab3a41.tar.xz
mb/amd/union_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: I0edfc7bb6d01eb1a12299fddd3d3ac45b43edfdb Reviewed-on: https://review.coreboot.org/c/coreboot/+/38875 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/mainboard/amd/union_station/Kconfig4
-rw-r--r--src/mainboard/amd/union_station/Kconfig.name4
-rw-r--r--src/mainboard/amd/union_station/Makefile.inc2
-rw-r--r--src/mainboard/amd/union_station/bootblock.c (renamed from src/mainboard/amd/union_station/romstage.c)6
4 files changed, 6 insertions, 10 deletions
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 1532d34062..72881b8d4c 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -13,14 +13,10 @@
# GNU General Public License for more details.
#
-config BOARD_AMD_UNIONSTATION
- def_bool n
-
if BOARD_AMD_UNIONSTATION
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/union_station/Kconfig.name b/src/mainboard/amd/union_station/Kconfig.name
index b4dc53656d..9af3c8270b 100644
--- a/src/mainboard/amd/union_station/Kconfig.name
+++ b/src/mainboard/amd/union_station/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_AMD_UNIONSTATION
-# bool"Unionstation"
+config BOARD_AMD_UNIONSTATION
+ bool "Unionstation"
diff --git a/src/mainboard/amd/union_station/Makefile.inc b/src/mainboard/amd/union_station/Makefile.inc
index 440744c479..ffea060d80 100644
--- a/src/mainboard/amd/union_station/Makefile.inc
+++ b/src/mainboard/amd/union_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/union_station/romstage.c b/src/mainboard/amd/union_station/bootblock.c
index af64ad8b50..f0361d6cf0 100644
--- a/src/mainboard/amd/union_station/romstage.c
+++ b/src/mainboard/amd/union_station/bootblock.c
@@ -13,10 +13,8 @@
* GNU General Public License for more details.
*/
-#include <northbridge/amd/agesa/state_machine.h>
-#include <sb_cimx.h>
+#include <bootblock_common.h>
-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
{
- sb_Poweron_Init();
}