diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-07-22 15:56:59 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-07-24 14:00:43 +0200 |
| commit | 9248bb35ab411c79467f5a79607994f4054baa7b (patch) | |
| tree | a808541e90b281f7fca3cf801fa8edd810a3a3dc | |
| parent | 0c797f1c28cd16c64482b2cea554e89baaa31445 (diff) | |
AGESA hudson yangtze: Move IMC firmware init out of get_bus_conf()
Change-Id: I5b3cbc4d25f06a5f916760d4474621abbf826ee4
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6355
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
| -rw-r--r-- | src/cpu/amd/agesa/amd_late_init.c | 8 | ||||
| -rw-r--r-- | src/mainboard/amd/olivehill/get_bus_conf.c | 5 | ||||
| -rw-r--r-- | src/mainboard/amd/parmer/get_bus_conf.c | 5 | ||||
| -rw-r--r-- | src/mainboard/amd/thatcher/get_bus_conf.c | 5 | ||||
| -rw-r--r-- | src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c | 5 |
5 files changed, 8 insertions, 20 deletions
diff --git a/src/cpu/amd/agesa/amd_late_init.c b/src/cpu/amd/agesa/amd_late_init.c index 0453006b0f..f893741528 100644 --- a/src/cpu/amd/agesa/amd_late_init.c +++ b/src/cpu/amd/agesa/amd_late_init.c @@ -24,6 +24,9 @@ #include "agesawrapper.h" #include <northbridge/amd/agesa/agesawrapper_call.h> +#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) +#include <southbridge/amd/agesa/hudson/imc.h> +#endif #if CONFIG_AMD_SB_CIMX #include <sb_cimx.h> #endif @@ -40,6 +43,11 @@ static void agesawrapper_post_device(void *unused) /* Preparation for write_tables(). */ get_bus_conf(); +#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) + /* AMD AGESA does not enable thermal zone, so we enable it here. */ + enable_imc_thermal_zone(); +#endif + #if CONFIG_AMD_SB_CIMX sb_Late_Post(); #endif diff --git a/src/mainboard/amd/olivehill/get_bus_conf.c b/src/mainboard/amd/olivehill/get_bus_conf.c index 1dda593943..a58c61ff39 100644 --- a/src/mainboard/amd/olivehill/get_bus_conf.c +++ b/src/mainboard/amd/olivehill/get_bus_conf.c @@ -77,9 +77,4 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ apicid_base = CONFIG_MAX_CPUS; apicid_yangtze = apicid_base; - -#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) - /* AMD AGESA does not enable thermal zone, so we enable it here. */ - enable_imc_thermal_zone(); -#endif } diff --git a/src/mainboard/amd/parmer/get_bus_conf.c b/src/mainboard/amd/parmer/get_bus_conf.c index 8dcd4e5593..3b3daf959f 100644 --- a/src/mainboard/amd/parmer/get_bus_conf.c +++ b/src/mainboard/amd/parmer/get_bus_conf.c @@ -68,9 +68,4 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ apicid_base = CONFIG_MAX_CPUS; apicid_hudson = apicid_base; - -#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) - /* AMD AGESA does not enable thermal zone, so we enable it here. */ - enable_imc_thermal_zone(); -#endif } diff --git a/src/mainboard/amd/thatcher/get_bus_conf.c b/src/mainboard/amd/thatcher/get_bus_conf.c index c2dbacd1f4..9f5f15ac87 100644 --- a/src/mainboard/amd/thatcher/get_bus_conf.c +++ b/src/mainboard/amd/thatcher/get_bus_conf.c @@ -65,9 +65,4 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ apicid_base = CONFIG_MAX_CPUS; apicid_hudson = apicid_base; - -#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) - /* AMD AGESA does not enable thermal zone, so we enable it here. */ - enable_imc_thermal_zone(); -#endif } diff --git a/src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c b/src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c index ef4eeb883e..f0494abad9 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c +++ b/src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c @@ -63,9 +63,4 @@ void get_bus_conf(void) /* I/O APICs: APIC ID Version State Address */ apicid_base = CONFIG_MAX_CPUS; apicid_hudson = apicid_base; - -#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) - /* AMD AGESA does not enable thermal zone, so we enable it here. */ - enable_imc_thermal_zone(); -#endif } |