[coreboot-gerrit] Change in coreboot[master]: soc/amd: Add "halt this AP" callback to romstage

[Richard Spiegel (Code Review)]

Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/25527

Change subject: soc/amd: Add "halt this AP" callback to romstage
......................................................................

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 
---
M src/soc/amd/common/block/cpu/Makefile.inc
M src/soc/amd/common/block/pi/def_callouts.c
2 files changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/25527/1

diff --git a/src/soc/amd/common/block/cpu/Makefile.inc b/src/soc/amd/common/block/cpu/Makefile.inc
index fed208a..395ab08 100644
--- a/src/soc/amd/common/block/cpu/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/Makefile.inc
@@ -4,4 +4,5 @@

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 beb2d18..fec1776 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 @@
 #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 },