diff options
author | Arthur Heymans <arthur@aheymans.xyz> | 2018-12-29 13:58:40 +0100 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-02-12 05:13:11 +0000 |
commit | 85e9f28461089fbb846f5e69aa220206a67d51c1 (patch) | |
tree | 98fdc018a4e028f2a82e5425c9d983b6177c6ae1 /src/soc/amd/common/block | |
parent | a8eb477c2ed7b756dc027084d1c20e449e96cb3f (diff) |
soc/amd/common: Don't use CAR_GLOBAL
All platforms using this code have NO_CAR_GLOBAL_MIGRATION.
Change-Id: I422d5637caa1b55fa6bad30d25f5e34cbba40851
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30509
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/soc/amd/common/block')
-rw-r--r-- | src/soc/amd/common/block/pi/agesawrapper.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c index 0fcb93e756..89cb9bec76 100644 --- a/src/soc/amd/common/block/pi/agesawrapper.c +++ b/src/soc/amd/common/block/pi/agesawrapper.c @@ -14,7 +14,6 @@ * GNU General Public License for more details. */ -#include <arch/early_variables.h> #include <arch/acpi.h> #include <cpu/x86/mtrr.h> #include <cbfs.h> @@ -613,23 +612,20 @@ const void *agesawrapper_locate_module(const char name[8]) return (AMD_MODULE_HEADER *)image->ModuleInfoOffset; } -static MODULE_ENTRY agesa_dispatcher CAR_GLOBAL; +static MODULE_ENTRY agesa_dispatcher; MODULE_ENTRY agesa_get_dispatcher(void) { const AMD_MODULE_HEADER *module; static const char id[8] = AGESA_ID; - MODULE_ENTRY val = car_get_var(agesa_dispatcher); - if (val != NULL) - return val; + if (agesa_dispatcher != NULL) + return agesa_dispatcher; module = agesawrapper_locate_module(id); if (!module) return NULL; - val = module->ModuleDispatcher; - car_set_var(agesa_dispatcher, val); - - return val; + agesa_dispatcher = module->ModuleDispatcher; + return agesa_dispatcher; } |