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/cezanne | |
| 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/cezanne')
| -rw-r--r-- | src/soc/amd/cezanne/cpu.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/cezanne/include/soc/reset.h | 9 | ||||
| -rw-r--r-- | src/soc/amd/cezanne/reset.c | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/src/soc/amd/cezanne/cpu.c b/src/soc/amd/cezanne/cpu.c index 6754bba5b9..148dcd8b31 100644 --- a/src/soc/amd/cezanne/cpu.c +++ b/src/soc/amd/cezanne/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 <console/console.h> #include <cpu/amd/microcode.h> @@ -12,7 +13,6 @@ #include <device/device.h> #include <soc/cpu.h> #include <soc/iomap.h> -#include <soc/reset.h> /* MP and SMM loading initialization */ diff --git a/src/soc/amd/cezanne/include/soc/reset.h b/src/soc/amd/cezanne/include/soc/reset.h deleted file mode 100644 index 4cb94ced02..0000000000 --- a/src/soc/amd/cezanne/include/soc/reset.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef AMD_CEZANNE_RESET_H -#define AMD_CEZANNE_RESET_H - -void set_warm_reset_flag(void); -int is_warm_reset(void); - -#endif /* AMD_CEZANNE_RESET_H */ diff --git a/src/soc/amd/cezanne/reset.c b/src/soc/amd/cezanne/reset.c index 89b5b809d6..aae76bf4c6 100644 --- a/src/soc/amd/cezanne/reset.c +++ b/src/soc/amd/cezanne/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> |