diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-03-10 15:47:00 +0100 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2021-03-11 15:11:20 +0000 |
| commit | a5cdf75f690c2fb48d00df6ab4e7ba2bfd8a4480 (patch) | |
| tree | 93de8f242ab575df4d02b8be7a24713e0099a9ed /src/soc/amd/picasso | |
| parent | 4626a6684ca02675cebd4e5ceea8ca959cd13472 (diff) | |
soc/amd: move warm reset flag function prototypes to common code
Even though the implementation is different on Stoneyridge compared to
Picasso and Cezanne, the function prototypes are identical, so move them
to the AMD SoC common reset header file.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I8d3a3a9ea568ea18658c49612efabdbe36d5f957
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51395
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/soc/amd/picasso')
| -rw-r--r-- | src/soc/amd/picasso/cpu.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/reset.h | 9 | ||||
| -rw-r--r-- | src/soc/amd/picasso/mca.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/reset.c | 1 |
4 files changed, 2 insertions, 12 deletions
diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c index 088660ea7a..36bbf0aa60 100644 --- a/src/soc/amd/picasso/cpu.c +++ b/src/soc/amd/picasso/cpu.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <amdblocks/cpu.h> +#include <amdblocks/reset.h> #include <amdblocks/smm.h> #include <cpu/cpu.h> #include <cpu/x86/mp.h> @@ -12,7 +13,6 @@ #include <device/pci_ops.h> #include <soc/pci_devs.h> #include <soc/cpu.h> -#include <soc/reset.h> #include <soc/smi.h> #include <soc/iomap.h> #include <console/console.h> diff --git a/src/soc/amd/picasso/include/soc/reset.h b/src/soc/amd/picasso/include/soc/reset.h deleted file mode 100644 index fb47068ea0..0000000000 --- a/src/soc/amd/picasso/include/soc/reset.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef AMD_PICASSO_RESET_H -#define AMD_PICASSO_RESET_H - -void set_warm_reset_flag(void); -int is_warm_reset(void); - -#endif /* AMD_PICASSO_RESET_H */ diff --git a/src/soc/amd/picasso/mca.c b/src/soc/amd/picasso/mca.c index e16d0a19e3..c21f4f1072 100644 --- a/src/soc/amd/picasso/mca.c +++ b/src/soc/amd/picasso/mca.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include <amdblocks/reset.h> #include <cpu/x86/msr.h> #include <acpi/acpi.h> #include <soc/cpu.h> -#include <soc/reset.h> #include <console/console.h> #include <arch/bert_storage.h> #include <cper.h> diff --git a/src/soc/amd/picasso/reset.c b/src/soc/amd/picasso/reset.c index 89b5b809d6..aae76bf4c6 100644 --- a/src/soc/amd/picasso/reset.c +++ b/src/soc/amd/picasso/reset.c @@ -3,7 +3,6 @@ #include <arch/io.h> #include <cf9_reset.h> #include <reset.h> -#include <soc/reset.h> #include <soc/southbridge.h> #include <amdblocks/acpimmio.h> #include <amdblocks/reset.h> |