Marc Jones (marc.jones@se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11020
-gerrit
commit 53e37a68fa77ae408d8ed4b7be7bd53e75b98a6f Author: Marc Jones marc.jones@se-eng.com Date: Tue Jul 21 17:15:25 2015 +0200
Revert "northbridge/amd/pi: Add support for memory settings"
This is breaking the build right now. Reapply one the correct headers are in place.
This reverts commit 406effd59075cab212c5bf9c1a12759c8fad50a4.
Change-Id: I34b8717820ed58b462d4e7793711ee98fb8b882f --- src/northbridge/amd/pi/agesawrapper.c | 15 --------------- src/northbridge/amd/pi/def_callouts.c | 3 --- 2 files changed, 18 deletions(-)
diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c index e716f9b..255b31d 100644 --- a/src/northbridge/amd/pi/agesawrapper.c +++ b/src/northbridge/amd/pi/agesawrapper.c @@ -26,9 +26,6 @@ #include <heapManager.h> #include <northbridge/amd/pi/agesawrapper.h> #include <northbridge/amd/pi/BiosCallOuts.h> -#include <PlatformMemoryConfiguration.h> - -extern const PSO_ENTRY PlatformMemoryConfiguration[];
VOID FchInitS3LateRestore (IN FCH_DATA_BLOCK *FchDataPtr); VOID FchInitS3EarlyRestore (IN FCH_DATA_BLOCK *FchDataPtr); @@ -139,18 +136,6 @@ AGESA_STATUS agesawrapper_amdinitpost(void) AmdCreateStruct (&AmdParamStruct); PostParams = (AMD_POST_PARAMS *)AmdParamStruct.NewStructPtr;
- /* - * A PlatformMemoryConfiguration[] table must be added in the - * mainboard folder to any boards that need the memory configuation - * settings altered from the standard settings. Examples of boards - * requiring this change might be boards with soldered down memory, - * or boards that use a non-standard memory clock routing scheme - * There are PlatformMemoryConfiguration[] tables in many existing - * mainboards that can be used as an example. - */ - if (PlatformMemoryConfiguration[0] != PSO_END) - PostParams->MemConfig.PlatformMemoryConfiguration = (PSO_ENTRY *)PlatformMemoryConfiguration; - // Do not use IS_ENABLED here. CONFIG_GFXUMA should always have a value. Allow // the compiler to flag the error if CONFIG_GFXUMA is not set. PostParams->MemConfig.UmaMode = CONFIG_GFXUMA ? UMA_AUTO : UMA_NONE; diff --git a/src/northbridge/amd/pi/def_callouts.c b/src/northbridge/amd/pi/def_callouts.c index 389742c..8a4472c 100644 --- a/src/northbridge/amd/pi/def_callouts.c +++ b/src/northbridge/amd/pi/def_callouts.c @@ -27,9 +27,6 @@ #include "agesawrapper.h" #include "BiosCallOuts.h" #include "dimmSpd.h" -#include <PlatformMemoryConfiguration.h> - -const PSO_ENTRY __attribute__((weak)) PlatformMemoryConfiguration[] = { PSO_END };
AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr) {