From 1d86d64618bbf658bd4072fac6ab7a3fb879c0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 13 Apr 2017 17:01:18 +0300 Subject: [PATCH] UPSTREAM: AGESA: Change guard for VBIOS callout BUG=none BRANCH=none TEST=none Change-Id: I29da2266d4744d863252444ef780bfe09571457c Signed-off-by: Patrick Georgi Original-Commit-Id: a28bfad3ad61a15d03f1a24cd0952b4ffe2d4936 Original-Change-Id: Ie046fd3c413585131669193a6669358adf709028 Original-Signed-off-by: Kysti Mlkki Original-Reviewed-on: https://review.coreboot.org/19268 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Martin Roth Original-Reviewed-by: Marshall Dawson Reviewed-on: https://chromium-review.googlesource.com/480286 --- src/northbridge/amd/agesa/def_callouts.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/northbridge/amd/agesa/def_callouts.c b/src/northbridge/amd/agesa/def_callouts.c index 0805c02118..20f6220227 100644 --- a/src/northbridge/amd/agesa/def_callouts.c +++ b/src/northbridge/amd/agesa/def_callouts.c @@ -106,10 +106,7 @@ AGESA_STATUS agesa_RunFuncOnAp (UINT32 Func, UINTN Data, VOID *ConfigPtr) return Status; } -#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY15_TN) || \ - IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY15_RL) || \ - IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY16_KB) -/* FIXME: we would like GFX disable for fam14 too for headless systems. */ +#if defined(AGESA_GNB_GFX_GET_VBIOS_IMAGE) AGESA_STATUS agesa_GfxGetVbiosImage(UINT32 Func, UINTN FchData, VOID *ConfigPrt) { GFX_VBIOS_IMAGE_INFO *pVbiosImageInfo = (GFX_VBIOS_IMAGE_INFO *)ConfigPrt;