diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-07-07 18:16:55 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-07-14 19:48:29 +0200 |
| commit | 232ae17718a3d183a4effb0eb4c8633ac87505b7 (patch) | |
| tree | 3941a9f319920c4305bee18e4addc926d0e01b41 /src/northbridge/amd | |
| parent | 7b23ae0e8938eb71453cbc28c2cc74c14a4039ae (diff) | |
AGESA fam12: Fix entry to cimx/sb700
Move SB700 calls to match comments and changes already made for
family14 et al.
Change-Id: I20a84e487ba346f63dd4454447077e0d2fd12c89
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6222
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/northbridge/amd')
| -rw-r--r-- | src/northbridge/amd/agesa/family12/northbridge.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 65212dce10..94de010935 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -767,10 +767,16 @@ printk(BIOS_DEBUG, " adsr - leaving this lovely routine.\n"); static void domain_enable_resources(device_t dev) { - /* Must be called after PCI enumeration and resource allocation */ - printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__); -// AGESAWRAPPER(amdinitmid); - printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__); + printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__); + + /* Must be called after PCI enumeration and resource allocation */ +#if CONFIG_AMD_SB_CIMX + sb_After_Pci_Init(); + sb_Mid_Post_Init(); +#endif + + AGESAWRAPPER(amdinitmid); + printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__); } @@ -807,23 +813,6 @@ static void cpu_bus_init(device_t dev) { printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__); initialize_cpus(dev->link_list); - -#if CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 - /* Must be called after PCI enumeration and resource allocation */ - printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - sb_After_Pci_Init - Start.\n",__func__); - sb_After_Pci_Init (); - printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - sb_After_Pci_Init - End.\n",__func__); -#endif // #if CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 - -#if CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 - /* Must be called after PCI enumeration and resource allocation */ - printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - sb_Mid_Post_Init - Start.\n",__func__); - sb_Mid_Post_Init (); - printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - sb_Mid_Post_Init - End.\n",__func__); -#endif // #if CONFIG_SOUTHBRIDGE_AMD_CIMX_SB900 - - /* Must be called after PCI enumeration and resource allocation */ - AGESAWRAPPER(amdinitmid); printk(BIOS_DEBUG, "Fam12h - northbridge.c - %s - End.\n",__func__); } |