diff options
| author | Iru Cai <mytbk920423@gmail.com> | 2019-01-01 21:43:19 +0800 |
|---|---|---|
| committer | Iru Cai <mytbk920423@gmail.com> | 2019-11-17 15:10:46 +0800 |
| commit | 65ff1bf698cc6f70c0859f59a50ac665073cd555 (patch) | |
| tree | bc8149894e1b1ab88e40109afac19e01aeb8e0b2 /src | |
| parent | 0ea942f01d61f94f002e080d9f9e5a1a0e9168d6 (diff) | |
| download | coreboot-65ff1bf698cc6f70c0859f59a50ac665073cd555.tar.xz | |
move gpPei to mrc_pei.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/northbridge/intel/haswell/do_raminit_frag.c | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/haswell/mrc_frag_init_memory.c | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/haswell/mrc_pei.h | 12 | ||||
| -rw-r--r-- | src/northbridge/intel/haswell/pei_svc.c | 12 |
4 files changed, 12 insertions, 14 deletions
diff --git a/src/northbridge/intel/haswell/do_raminit_frag.c b/src/northbridge/intel/haswell/do_raminit_frag.c index 6518096c70..9727d50f36 100644 --- a/src/northbridge/intel/haswell/do_raminit_frag.c +++ b/src/northbridge/intel/haswell/do_raminit_frag.c @@ -37,7 +37,6 @@ static void io_fffa3c2e(void) outb(tmp, 0x71); } -static const EFI_PEI_SERVICES ***gpPei = (const EFI_PEI_SERVICES***)0xff7d7538; void __attribute((regparm(2))) fcn_fffc5bf6(const EFI_PEI_SERVICES **ps, void *); void fcn_fffb9720(const EFI_PEI_SERVICES **ps, int, int); diff --git a/src/northbridge/intel/haswell/mrc_frag_init_memory.c b/src/northbridge/intel/haswell/mrc_frag_init_memory.c index 7fba2a8bd7..7e5d07f58e 100644 --- a/src/northbridge/intel/haswell/mrc_frag_init_memory.c +++ b/src/northbridge/intel/haswell/mrc_frag_init_memory.c @@ -26,7 +26,6 @@ int frag_fffc1fc3(void) return 0; } -static const EFI_PEI_SERVICES ***gpPei = (const EFI_PEI_SERVICES***)0xff7d7538; extern EFI_GUID mEfiMemoryRestoreDataGuid; void *create_raminit_hob(void); diff --git a/src/northbridge/intel/haswell/mrc_pei.h b/src/northbridge/intel/haswell/mrc_pei.h index 077d3f21c7..3034ddac83 100644 --- a/src/northbridge/intel/haswell/mrc_pei.h +++ b/src/northbridge/intel/haswell/mrc_pei.h @@ -4,6 +4,7 @@ #include <stdint.h> #include <stddef.h> #include "pei_data.h" +#include <console/console.h> #ifndef EFIAPI #define EFIAPI /* __attribute((msabi)) */ @@ -180,4 +181,15 @@ void init_mrc_pei(MRC_PEI *pei, struct pei_data *pd); EFI_HOB_DATA * __attribute((regparm(2))) locate_hob(EFI_GUID *guid, uint16_t v); +#define gpPei ((const EFI_PEI_SERVICES***)0xff7d7538) + +static inline +MRC_PEI *PEI_FROM_PEI_SERVICE(const EFI_PEI_SERVICES *ps) +{ + MRC_PEI *pei = (MRC_PEI *)((void*)ps - 4); + if (pei->sig != PEI_SIGNATURE) + die("PEI signature error!\n"); + return pei; +} + #endif diff --git a/src/northbridge/intel/haswell/pei_svc.c b/src/northbridge/intel/haswell/pei_svc.c index 80e021ed3f..eab6d03707 100644 --- a/src/northbridge/intel/haswell/pei_svc.c +++ b/src/northbridge/intel/haswell/pei_svc.c @@ -2,18 +2,6 @@ #include "mrc_utils.h" #include "mrc_misc.h" #include <string.h> -#include <console/console.h> - -static const EFI_PEI_SERVICES ***gpPei = (const EFI_PEI_SERVICES***)0xff7d7538; - -static inline -MRC_PEI *PEI_FROM_PEI_SERVICE(const EFI_PEI_SERVICES *ps) -{ - MRC_PEI *pei = (MRC_PEI *)((void*)ps - 4); - if (pei->sig != PEI_SIGNATURE) - die("PEI signature error!\n"); - return pei; -} int EFIAPI PeiInstallPpi(const EFI_PEI_SERVICES **PeiServices, |