asrock/imb-a180: Switch away from AGESA_LEGACY
Change-Id: I00bd4d895b2585235bf5b3edd23fbcddba69d31e Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/18714 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
parent
2d98120d3b
commit
1dea4b13e8
|
@ -17,7 +17,6 @@ if BOARD_ASROCK_IMB_A180
|
||||||
|
|
||||||
config BOARD_SPECIFIC_OPTIONS # dummy
|
config BOARD_SPECIFIC_OPTIONS # dummy
|
||||||
def_bool y
|
def_bool y
|
||||||
select AGESA_LEGACY
|
|
||||||
select CPU_AMD_AGESA_FAMILY16_KB
|
select CPU_AMD_AGESA_FAMILY16_KB
|
||||||
select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
|
select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
|
||||||
select SOUTHBRIDGE_AMD_AGESA_YANGTZE
|
select SOUTHBRIDGE_AMD_AGESA_YANGTZE
|
||||||
|
|
|
@ -21,39 +21,21 @@
|
||||||
#include <arch/io.h>
|
#include <arch/io.h>
|
||||||
#include <arch/stages.h>
|
#include <arch/stages.h>
|
||||||
#include <device/pnp_def.h>
|
#include <device/pnp_def.h>
|
||||||
#include <arch/cpu.h>
|
|
||||||
#include <cpu/x86/lapic.h>
|
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include <commonlib/loglevel.h>
|
#include <commonlib/loglevel.h>
|
||||||
#include <cpu/amd/car.h>
|
|
||||||
#include <northbridge/amd/agesa/agesawrapper.h>
|
#include <northbridge/amd/agesa/state_machine.h>
|
||||||
#include <northbridge/amd/agesa/agesa_helper.h>
|
|
||||||
#include <cpu/x86/bist.h>
|
|
||||||
#include <cpu/x86/lapic.h>
|
|
||||||
#include <southbridge/amd/agesa/hudson/hudson.h>
|
#include <southbridge/amd/agesa/hudson/hudson.h>
|
||||||
#include <cpu/amd/agesa/s3_resume.h>
|
|
||||||
#include "cbmem.h"
|
|
||||||
#include <superio/winbond/common/winbond.h>
|
#include <superio/winbond/common/winbond.h>
|
||||||
#include <superio/winbond/w83627uhg/w83627uhg.h>
|
#include <superio/winbond/w83627uhg/w83627uhg.h>
|
||||||
|
|
||||||
#define SERIAL_DEV PNP_DEV(0x2e, W83627UHG_SP1)
|
#define SERIAL_DEV PNP_DEV(0x2e, W83627UHG_SP1)
|
||||||
|
|
||||||
|
void board_BeforeAgesa(struct sysinfo *cb)
|
||||||
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
|
||||||
{
|
{
|
||||||
u32 val, t32;
|
volatile u32 *addr32;
|
||||||
u32 *addr32;
|
u32 t32;
|
||||||
|
|
||||||
/* In Hudson RRG, PMIOxD2[5:4] is "Drive strength control for
|
|
||||||
* LpcClk[1:0]". To be consistent with Parmer, setting to 4mA
|
|
||||||
* even though the register is not documented in the Kabini BKDG.
|
|
||||||
* Otherwise the serial output is bad code.
|
|
||||||
*/
|
|
||||||
//outb(0xD2, 0xcd6);
|
|
||||||
//outb(0x00, 0xcd7);
|
|
||||||
|
|
||||||
/* Must come first to enable PCI MMCONF. */
|
|
||||||
amd_initmmio();
|
|
||||||
|
|
||||||
/* Set LPC decode enables. */
|
/* Set LPC decode enables. */
|
||||||
pci_devfn_t dev = PCI_DEV(0, 0x14, 3);
|
pci_devfn_t dev = PCI_DEV(0, 0x14, 3);
|
||||||
|
@ -65,6 +47,10 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
||||||
outb(0x24, 0xcd6);
|
outb(0x24, 0xcd6);
|
||||||
outb(0x1, 0xcd7);
|
outb(0x1, 0xcd7);
|
||||||
|
|
||||||
|
/* Disable PCI-PCI bridge and release GPIO32/33 for other uses. */
|
||||||
|
outb(0xea, 0xcd6);
|
||||||
|
outb(0x1, 0xcd7);
|
||||||
|
|
||||||
/* Set auxiliary output clock frequency on OSCOUT1 pin to be 48MHz */
|
/* Set auxiliary output clock frequency on OSCOUT1 pin to be 48MHz */
|
||||||
addr32 = (u32 *)0xfed80e28;
|
addr32 = (u32 *)0xfed80e28;
|
||||||
t32 = *addr32;
|
t32 = *addr32;
|
||||||
|
@ -77,64 +63,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
||||||
t32 &= 0xffffbffb;
|
t32 &= 0xffffbffb;
|
||||||
*addr32 = t32;
|
*addr32 = t32;
|
||||||
|
|
||||||
if (!cpu_init_detectedx && boot_cpu()) {
|
/* w83627uhg has a default clk of 48MHz, p.9 of data-sheet */
|
||||||
post_code(0x30);
|
winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
|
||||||
post_code(0x31);
|
|
||||||
|
|
||||||
/* w83627uhg has a default clk of 48MHz, p.9 of data-sheet */
|
|
||||||
winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
|
|
||||||
|
|
||||||
console_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Halt if there was a built in self test failure */
|
|
||||||
post_code(0x34);
|
|
||||||
report_bist_failure(bist);
|
|
||||||
|
|
||||||
/* Load MPB */
|
|
||||||
val = cpuid_eax(1);
|
|
||||||
printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val);
|
|
||||||
printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);
|
|
||||||
|
|
||||||
/* On Larne, after LpcClkDrvSth is set, it needs some time to be stable, because of the buffer ICS551M */
|
|
||||||
int i;
|
|
||||||
for(i = 0; i < 200000; i++)
|
|
||||||
val = inb(0xcd6);
|
|
||||||
|
|
||||||
post_code(0x37);
|
|
||||||
agesawrapper_amdinitreset();
|
|
||||||
post_code(0x38);
|
|
||||||
printk(BIOS_DEBUG, "Got past yangtze_early_setup\n");
|
|
||||||
|
|
||||||
post_code(0x39);
|
|
||||||
|
|
||||||
agesawrapper_amdinitearly();
|
|
||||||
int s3resume = acpi_is_wakeup_s3();
|
|
||||||
if (!s3resume) {
|
|
||||||
post_code(0x40);
|
|
||||||
agesawrapper_amdinitpost();
|
|
||||||
post_code(0x41);
|
|
||||||
agesawrapper_amdinitenv();
|
|
||||||
/* TODO: Disable cache is not ok. */
|
|
||||||
disable_cache_as_ram();
|
|
||||||
} else { /* S3 detect */
|
|
||||||
printk(BIOS_INFO, "S3 detected\n");
|
|
||||||
|
|
||||||
post_code(0x60);
|
|
||||||
agesawrapper_amdinitresume();
|
|
||||||
|
|
||||||
amd_initcpuio();
|
|
||||||
agesawrapper_amds3laterestore();
|
|
||||||
|
|
||||||
post_code(0x61);
|
|
||||||
prepare_for_resume();
|
|
||||||
}
|
|
||||||
|
|
||||||
outb(0xEA, 0xCD6);
|
|
||||||
outb(0x1, 0xcd7);
|
|
||||||
|
|
||||||
post_code(0x50);
|
|
||||||
copy_and_run();
|
|
||||||
|
|
||||||
post_code(0x54); /* Should never see this post code. */
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue