amd/torpedo: Switch away from AGESA_LEGACY
Change-Id: Id074f3656801d412efb9485a6e2578beb9782259 Signed-off-by: Martin Roth <gaumless@gmail.com> Reviewed-on: https://review.coreboot.org/18994 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
parent
c43d5049ea
commit
24b6a26ca9
|
@ -17,7 +17,6 @@ if BOARD_AMD_TORPEDO
|
|||
|
||||
config BOARD_SPECIFIC_OPTIONS # dummy
|
||||
def_bool y
|
||||
select AGESA_LEGACY
|
||||
select CPU_AMD_AGESA_FAMILY12
|
||||
select NORTHBRIDGE_AMD_AGESA_FAMILY12
|
||||
select SOUTHBRIDGE_AMD_CIMX_SB900
|
||||
|
|
|
@ -13,82 +13,13 @@
|
|||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <device/pci_def.h>
|
||||
#include <device/pci_ids.h>
|
||||
#include <arch/io.h>
|
||||
#include <arch/stages.h>
|
||||
#include <device/pnp_def.h>
|
||||
#include <cpu/x86/lapic.h>
|
||||
#include <console/console.h>
|
||||
#include <commonlib/loglevel.h>
|
||||
#include <cpu/amd/car.h>
|
||||
#include <northbridge/amd/agesa/agesawrapper.h>
|
||||
#include <northbridge/amd/agesa/agesa_helper.h>
|
||||
#include <cpu/x86/bist.h>
|
||||
#include <northbridge/amd/agesa/state_machine.h>
|
||||
#include <superio/smsc/kbc1100/kbc1100.h>
|
||||
#include <cpu/x86/lapic.h>
|
||||
#include "sb_cimx.h"
|
||||
#include "SbPlatform.h"
|
||||
#include <arch/cpu.h>
|
||||
#include "platform_cfg.h"
|
||||
|
||||
#define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1)
|
||||
|
||||
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
||||
void board_BeforeAgesa(struct sysinfo *cb)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
/* Must come first to enable PCI MMCONF. */
|
||||
amd_initmmio();
|
||||
|
||||
post_code(0x35);
|
||||
|
||||
if (!cpu_init_detectedx && boot_cpu()) {
|
||||
post_code(0x30);
|
||||
gpioEarlyInit();
|
||||
sb_poweron_init();
|
||||
|
||||
post_code(0x31);
|
||||
|
||||
kbc1100_early_init(0x2e);
|
||||
kbc1100_early_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
|
||||
|
||||
post_code(0x32);
|
||||
post_code(0x33);
|
||||
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);
|
||||
|
||||
post_code(0x36);
|
||||
agesawrapper_amdinitreset();
|
||||
|
||||
post_code(0x37);
|
||||
agesawrapper_amdinitearly();
|
||||
|
||||
post_code(0x38);
|
||||
agesawrapper_amdinitpost();
|
||||
|
||||
post_code(0x39);
|
||||
printk(BIOS_DEBUG, "sb_before_pci_init ");
|
||||
sb_before_pci_init();
|
||||
printk(BIOS_DEBUG, "passed.\n");
|
||||
|
||||
post_code(0x40);
|
||||
agesawrapper_amdinitenv();
|
||||
|
||||
post_code(0x43);
|
||||
copy_and_run();
|
||||
printk(BIOS_ERR, "Error: copy_and_run returned!\n");
|
||||
|
||||
post_code(0x44); // Should never see this post code.
|
||||
kbc1100_early_init(0x2e);
|
||||
kbc1100_early_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue