[coreboot-gerrit] New patch to review for coreboot: 4af65ea AGESA fam15: Fix entry to cimx/sb900

[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/6238

-gerrit

commit 4af65ea91d84b747138e2655f5add005a93b1ba4
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Mon Jul 7 18:16:55 2014 +0300

    AGESA fam15: Fix entry to cimx/sb900
    
    Move SB900 call to match comments and changes already made for
    family14 et al.
    
    Change-Id: I22aa0bbeeabf9cff929c49c23014005bc3d53ccb
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/cpu/amd/agesa/amd_late_init.c                | 3 ---
 src/northbridge/amd/agesa/family15/northbridge.c | 5 +++++
 src/southbridge/amd/cimx/sb700/sb_cimx.h         | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/cpu/amd/agesa/amd_late_init.c b/src/cpu/amd/agesa/amd_late_init.c
index 83e9ed8..0453006 100644
--- a/src/cpu/amd/agesa/amd_late_init.c
+++ b/src/cpu/amd/agesa/amd_late_init.c
@@ -40,9 +40,6 @@ static void agesawrapper_post_device(void *unused)
 	/* Preparation for write_tables(). */
 	get_bus_conf();
 
-#if CONFIG_AMD_SB_CIMX && CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY15
-	sb_After_Pci_Init();
-#endif
 #if CONFIG_AMD_SB_CIMX
 	sb_Late_Post();
 #endif
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index 34f58d3..34d7ea3 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -42,6 +42,7 @@
 #include "agesawrapper.h"
 #include <northbridge/amd/agesa/agesawrapper_call.h>
 #include "northbridge.h"
+#include "sb_cimx.h"
 
 #define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)
 
@@ -591,6 +592,10 @@ static void domain_enable_resources(device_t dev)
 {
 	/* Must be called after PCI enumeration and resource allocation */
 	printk(BIOS_DEBUG, "\nFam15 - %s: AmdInitMid.\n", __func__);
+
+#if CONFIG_AMD_SB_CIMX
+	sb_After_Pci_Init();
+#endif
 	AGESAWRAPPER(amdinitmid);
 	printk(BIOS_DEBUG, "  Fam15 - leaving %s.\n", __func__);
 }
diff --git a/src/southbridge/amd/cimx/sb700/sb_cimx.h b/src/southbridge/amd/cimx/sb700/sb_cimx.h
index ebfaca8..b123c51 100644
--- a/src/southbridge/amd/cimx/sb700/sb_cimx.h
+++ b/src/southbridge/amd/cimx/sb700/sb_cimx.h
@@ -34,7 +34,6 @@
 void sb_Poweron_Init(void);
 void sb_Before_Pci_Init(void);
 void sb_After_Pci_Init(void);
-void sb_Mid_Post_Init(void);
 void sb_Late_Post(void);
 
 void sb7xx_51xx_enable_wideio(u8 wio_index, u16 base);