amd/XX/hudson: Remove #if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)

Remove the unnecessary #if from around the #include "fchec.h".
Turn #if statements into if().

Change-Id: Ia0582b3ce24c55dd439dfadb727507240accd9d5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21188
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Kyösti Mälkki 2017-08-24 21:20:10 +03:00
parent 20a5a8964f
commit eb064b3947
2 changed files with 8 additions and 14 deletions

View File

@ -181,12 +181,10 @@ static void hudson_init(void *chip_info)
static void hudson_final(void *chip_info)
{
#if !IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
/* AMD AGESA does not enable thermal zone, so we enable it here. */
enable_imc_thermal_zone();
#endif
#endif
if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM) &&
!IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE))
enable_imc_thermal_zone();
}
struct chip_operations southbridge_amd_agesa_hudson_ops = {

View File

@ -26,10 +26,7 @@
#include "hudson.h"
#include "smbus.h"
#include "smi.h"
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
#include "fchec.h"
#endif
int acpi_get_sleep_type(void)
{
@ -123,12 +120,11 @@ static void hudson_init(void *chip_info)
static void hudson_final(void *chip_info)
{
#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)
agesawrapper_fchecfancontrolservice();
#if !IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
enable_imc_thermal_zone();
#endif
#endif
if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM)) {
agesawrapper_fchecfancontrolservice();
if (!IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE))
enable_imc_thermal_zone();
}
}
struct chip_operations southbridge_amd_pi_hudson_ops = {