[coreboot-gerrit] New patch to review for coreboot: 130b03a AGESA hudson yangtze: Move IMC firmware init out of get_bus_conf()

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6355

-gerrit

commit 130b03a476f8d2c8a1658f77e25bcb8f87a152ab
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Tue Jul 22 15:56:59 2014 +0300

    AGESA hudson yangtze: Move IMC firmware init out of get_bus_conf()
    
    Change-Id: I5b3cbc4d25f06a5f916760d4474621abbf826ee4
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/cpu/amd/agesa/amd_late_init.c                  | 8 ++++++++
 src/mainboard/amd/olivehill/get_bus_conf.c         | 5 -----
 src/mainboard/amd/parmer/get_bus_conf.c            | 5 -----
 src/mainboard/amd/thatcher/get_bus_conf.c          | 5 -----
 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 0453006..f893741 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 1dda593..a58c61f 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 8dcd4e5..3b3daf9 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 c2dbacd..9f5f15a 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 ef4eeb8..f0494ab 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
 }