From 23e5ba9a733272562cc69b031055c6a7149cbabc Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Wed, 16 Aug 2017 17:21:41 -0600 Subject: binarypi mainboards: Clean up IS_ENABLED fan control MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove all checks for #if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) around the imc.h includes. Convert from #if to if() for all fan control setup code. Where necessary, make functions non-static to match the prototypes in imc.h. Change-Id: If88af42d00227285931829441909a982fc292b2b Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/21058 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/mainboard/amd/bettong/BiosCallOuts.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mainboard/amd/bettong/BiosCallOuts.c') diff --git a/src/mainboard/amd/bettong/BiosCallOuts.c b/src/mainboard/amd/bettong/BiosCallOuts.c index 4f09e8dc52..b251a5a5e7 100644 --- a/src/mainboard/amd/bettong/BiosCallOuts.c +++ b/src/mainboard/amd/bettong/BiosCallOuts.c @@ -23,9 +23,7 @@ #include "heapManager.h" #include "FchPlatform.h" #include "cbfs.h" -#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) #include "imc.h" -#endif #include "hudson.h" #include #include "northbridge/amd/pi/dimmSpd.h" @@ -74,9 +72,8 @@ AGESA_STATUS Fch_Oem_config(UINT32 Func, UINTN FchData, VOID *ConfigPtr) } else if (StdHeader->Func == AMD_INIT_ENV) { FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData; printk(BIOS_DEBUG, "Fch OEM config in INIT ENV "); -#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) - oem_fan_control(FchParams_env); -#endif + if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) + oem_fan_control(FchParams_env); /* XHCI configuration */ if (IS_ENABLED(CONFIG_HUDSON_XHCI_ENABLE)) -- cgit v1.2.3