soc/amd/common: Remove #ifndef/#endif from AGESA wrapper

There isn't a good reason to keep the checks for __PRE_RAM__.  The global
variables are not used outside of ramstage and the linker removes them
cleanly in other stages.

BUG=b:70671590
TEST=Build and boot Kahlee

Change-Id: I7a35141f212f340c157d57fde8daf93c0c383af8
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/22885
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Marshall Dawson 2017-12-13 21:53:09 -07:00 committed by Martin Roth
parent 8f6cd22087
commit ff4da93f4e
1 changed files with 0 additions and 6 deletions

View File

@ -26,7 +26,6 @@
void __attribute__((weak)) SetMemParams(AMD_POST_PARAMS *PostParams) {} void __attribute__((weak)) SetMemParams(AMD_POST_PARAMS *PostParams) {}
void __attribute__((weak)) OemPostParams(AMD_POST_PARAMS *PostParams) {} void __attribute__((weak)) OemPostParams(AMD_POST_PARAMS *PostParams) {}
#ifndef __PRE_RAM__
/* ACPI table pointers returned by AmdInitLate */ /* ACPI table pointers returned by AmdInitLate */
static void *DmiTable; static void *DmiTable;
static void *AcpiPstate; static void *AcpiPstate;
@ -38,7 +37,6 @@ static void *AcpiWheaCmc;
static void *AcpiAlib; static void *AcpiAlib;
static void *AcpiIvrs; static void *AcpiIvrs;
static void *AcpiCrat; static void *AcpiCrat;
#endif /* #ifndef __PRE_RAM__ */
static AGESA_STATUS agesawrapper_readeventlog(UINT8 HeapStatus) static AGESA_STATUS agesawrapper_readeventlog(UINT8 HeapStatus)
{ {
@ -244,7 +242,6 @@ AGESA_STATUS agesawrapper_amdinitenv(void)
return status; return status;
} }
#ifndef __PRE_RAM__
VOID* agesawrapper_getlateinitptr (int pick) VOID* agesawrapper_getlateinitptr (int pick)
{ {
switch (pick) { switch (pick) {
@ -270,7 +267,6 @@ VOID* agesawrapper_getlateinitptr (int pick)
return NULL; return NULL;
} }
} }
#endif /* #ifndef __PRE_RAM__ */
AGESA_STATUS agesawrapper_amdinitmid(void) AGESA_STATUS agesawrapper_amdinitmid(void)
{ {
@ -313,7 +309,6 @@ AGESA_STATUS agesawrapper_amdinitmid(void)
return status; return status;
} }
#ifndef __PRE_RAM__
AGESA_STATUS agesawrapper_amdinitlate(void) AGESA_STATUS agesawrapper_amdinitlate(void)
{ {
AGESA_STATUS Status; AGESA_STATUS Status;
@ -362,7 +357,6 @@ AGESA_STATUS agesawrapper_amdinitlate(void)
/* AmdReleaseStruct (&AmdParamStruct); */ /* AmdReleaseStruct (&AmdParamStruct); */
return Status; return Status;
} }
#endif /* #ifndef __PRE_RAM__ */
AGESA_STATUS agesawrapper_amdlaterunaptask ( AGESA_STATUS agesawrapper_amdlaterunaptask (
UINT32 Func, UINT32 Func,