commit 9248bb35ab411c79467f5a79607994f4054baa7b
author Kyösti Mälkki <kyosti.malkki@gmail.com> Tue Jul 22 15:56:59 2014 +0300
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Thu Jul 24 14:00:43 2014 +0200
tree a808541e90b281f7fca3cf801fa8edd810a3a3dc
parent 0c797f1c28cd16c64482b2cea554e89baaa31445

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>

src/cpu/amd/agesa/amd_late_init.c

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 @@
 	/* 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

src/mainboard/amd/olivehill/get_bus_conf.c

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 @@
 	/* 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
 }

src/mainboard/amd/parmer/get_bus_conf.c

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 @@
 	/* 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
 }

src/mainboard/amd/thatcher/get_bus_conf.c

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 @@
 	/* 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
 }

src/mainboard/hp/pavilion_m6_1035dx/get_bus_conf.c

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 @@
 	/* 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
 }