From a4c370a3e0dad412deaf79f6a455afd4caea1c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 22 Oct 2014 06:42:57 +0300 Subject: [PATCH] amd/olivehillplus: No global variables for romstage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These functions are only used for ramstage. Change-Id: I089230ca625037637c7af061b0939fd981dbdfd2 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7148 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Paul Menzel --- .../amd/olivehillplus/agesawrapper.c | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/mainboard/amd/olivehillplus/agesawrapper.c b/src/mainboard/amd/olivehillplus/agesawrapper.c index 6b4835e75e..45670bdce4 100644 --- a/src/mainboard/amd/olivehillplus/agesawrapper.c +++ b/src/mainboard/amd/olivehillplus/agesawrapper.c @@ -46,16 +46,18 @@ VOID FchInitS3EarlyRestore (IN FCH_DATA_BLOCK *FchDataPtr); #define FILECODE UNASSIGNED_FILE_FILECODE +#ifndef __PRE_RAM__ /* ACPI table pointers returned by AmdInitLate */ -VOID *DmiTable = NULL; -VOID *AcpiPstate = NULL; -VOID *AcpiSrat = NULL; -VOID *AcpiSlit = NULL; +static void *DmiTable = NULL; +static void *AcpiPstate = NULL; +static void *AcpiSrat = NULL; +static void *AcpiSlit = NULL; -VOID *AcpiWheaMce = NULL; -VOID *AcpiWheaCmc = NULL; -VOID *AcpiAlib = NULL; -VOID *AcpiIvrs = NULL; +static void *AcpiWheaMce = NULL; +static void *AcpiWheaCmc = NULL; +static void *AcpiAlib = NULL; +static void *AcpiIvrs = NULL; +#endif AGESA_STATUS agesawrapper_amdinitcpuio(void) { @@ -287,6 +289,7 @@ AGESA_STATUS agesawrapper_amdinitenv(void) return status; } +#ifndef __PRE_RAM__ VOID* agesawrapper_getlateinitptr (int pick) { switch (pick) { @@ -310,6 +313,7 @@ VOID* agesawrapper_getlateinitptr (int pick) return NULL; } } +#endif AGESA_STATUS agesawrapper_amdinitmid(void) { @@ -341,6 +345,7 @@ AGESA_STATUS agesawrapper_amdinitmid(void) return status; } +#ifndef __PRE_RAM__ AGESA_STATUS agesawrapper_amdinitlate(void) { AGESA_STATUS Status; @@ -389,6 +394,7 @@ AGESA_STATUS agesawrapper_amdinitlate(void) /* AmdReleaseStruct (&AmdParamStruct); */ return Status; } +#endif AGESA_STATUS agesawrapper_amdlaterunaptask ( UINT32 Func,