summaryrefslogtreecommitdiff
path: root/src/soc/amd/common/block
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2023-08-18 16:28:29 -0600
committerMartin L Roth <gaumless@gmail.com>2023-08-26 21:39:22 +0000
commit8fc68816a96c6fdfc7a35ec1c68b681b03decc06 (patch)
tree4316aa27580c58bafde7d17b5f2e60756ec2d37a /src/soc/amd/common/block
parent7687e7767f2d2321b57fa8eab68b7e954e57ad42 (diff)
soc/amd: Move psp_transfer.h out of each SOC into common
The psp_transfer.h file was the same under all SoCs, and is really tied to the file common/vboot/transfer.c, not the SOC. This patch makes an include directory under vboot to put the header into and sets it to be included for all SoCs using SOC_AMD_COMMON. This makes the header file available to all platforms, so that new chips that don't use the psp_verstage don't have to make a psp_transfer.h file just to satisfy the compiler. Signed-off-by: Martin Roth <gaumless@gmail.com> Change-Id: I5b9f2adee3a1d4d8d32813ec0a850344b7d717b2 Reviewed-on: https://review.coreboot.org/c/coreboot/+/77303 Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/common/block')
-rw-r--r--src/soc/amd/common/block/cpu/noncar/bootblock.c2
-rw-r--r--src/soc/amd/common/block/cpu/noncar/memlayout_psp_verstage.ld2
-rw-r--r--src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/amd/common/block/cpu/noncar/bootblock.c b/src/soc/amd/common/block/cpu/noncar/bootblock.c
index 9ef899e5ac..e32499de04 100644
--- a/src/soc/amd/common/block/cpu/noncar/bootblock.c
+++ b/src/soc/amd/common/block/cpu/noncar/bootblock.c
@@ -6,8 +6,8 @@
#include <console/console.h>
#include <cpu/cpu.h>
#include <cpu/x86/tsc.h>
+#include <psp_verstage/psp_transfer.h>
#include <soc/southbridge.h>
-#include <soc/psp_transfer.h>
#include <stdint.h>
asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
diff --git a/src/soc/amd/common/block/cpu/noncar/memlayout_psp_verstage.ld b/src/soc/amd/common/block/cpu/noncar/memlayout_psp_verstage.ld
index e0278abfc8..cc1a1b5026 100644
--- a/src/soc/amd/common/block/cpu/noncar/memlayout_psp_verstage.ld
+++ b/src/soc/amd/common/block/cpu/noncar/memlayout_psp_verstage.ld
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <memlayout.h>
-#include <soc/psp_transfer.h>
#include <fmap_config.h>
+#include <psp_verstage/psp_transfer.h>
#include <soc/psp_verstage_addr.h>
ENTRY(_psp_vs_start)
diff --git a/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld b/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
index 42323f51bf..090d8b727f 100644
--- a/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
+++ b/src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
@@ -2,7 +2,7 @@
#include <memlayout.h>
#include <arch/header.ld>
-#include <soc/psp_transfer.h>
+#include <psp_verstage/psp_transfer.h>
#define EARLY_RESERVED_DRAM_START(addr) REGION_START(early_reserved_dram, addr)
#define EARLY_RESERVED_DRAM_END(addr) REGION_END(early_reserved_dram, addr)