From 09a16e6a323e16b0428c4cbd3beae38d394aa91e Mon Sep 17 00:00:00 2001 From: Richard Spiegel Date: Wed, 4 Apr 2018 12:40:20 -0700 Subject: soc/amd: Add "halt this AP" callback to romstage As part of moving AGESA calls from bootblock to romstage, callback function AGESA_HALT_THIS_AP must be available at romstage. BUG=b:74236170 TEST=Build and boot grunt, actual test will be performed at a later patch. Change-Id: I0992b2de5856881c19191ec4f637168727686524 Signed-off-by: Richard Spiegel Reviewed-on: https://review.coreboot.org/25527 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- src/soc/amd/common/block/cpu/Makefile.inc | 1 + src/soc/amd/common/block/pi/def_callouts.c | 3 +++ 2 files changed, 4 insertions(+) (limited to 'src/soc/amd/common') diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc index fed208a378..395ab084a3 100644 --- a/src/soc/amd/common/block/cpu/Makefile.inc +++ b/src/soc/amd/common/block/cpu/Makefile.inc @@ -4,4 +4,5 @@ bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/exit_car.S postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/exit_car.S +romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/ap_exit_car.S romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_CAR) += car/exit_car.S diff --git a/src/soc/amd/common/block/pi/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c index beb2d18c2e..fec1776da2 100644 --- a/src/soc/amd/common/block/pi/def_callouts.c +++ b/src/soc/amd/common/block/pi/def_callouts.c @@ -35,6 +35,9 @@ const BIOS_CALLOUT_STRUCT BiosCallouts[] = { #else const BIOS_CALLOUT_STRUCT BiosCallouts[] = { /* Required callouts */ +#if ENV_ROMSTAGE + { AGESA_HALT_THIS_AP, agesa_HaltThisAp }, +#endif { AGESA_ALLOCATE_BUFFER, agesa_AllocateBuffer }, { AGESA_DEALLOCATE_BUFFER, agesa_DeallocateBuffer }, { AGESA_DO_RESET, agesa_Reset }, -- cgit v1.2.3