diff options
| author | Richard Spiegel <richard.spiegel@amd.corp-partner.google.com> | 2018-04-04 12:40:20 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-04-10 16:24:20 +0000 |
| commit | 09a16e6a323e16b0428c4cbd3beae38d394aa91e (patch) | |
| tree | 5584e017ebced18216ac6a7de11242bf2d02fec7 | |
| parent | e2f301d34bd8d3be76f1a09c8cf32cba6764dd6d (diff) | |
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 <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/25527
Reviewed-by: Martin Roth <martinroth@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/soc/amd/common/block/cpu/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/amd/common/block/pi/def_callouts.c | 3 |
2 files changed, 4 insertions, 0 deletions
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 }, |