GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/amd/thatcher: Switch away from ROMCC_BOOTBLOCK 

Warning: Not tested on hardware.

Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Signed-off-by: Mike Banon <mikebdp2@gmail.com>
Change-Id: I948eeaaeb7975561fffc1218c70dba6a784101fe
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38877
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Mike Banon 2020-02-13 16:25:10 +00:00 committed by Patrick Georgi
parent 0dcbcd3191
commit 0bed4c84cc
4 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/amd/thatcher/Kconfig
View File

@ -13,14 +13,10 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
config BOARD_AMD_THATCHER
def_bool n
if BOARD_AMD_THATCHER if BOARD_AMD_THATCHER
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
#select ROMCC_BOOTBLOCK
select CPU_AMD_AGESA_FAMILY15_TN select CPU_AMD_AGESA_FAMILY15_TN
select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
select SOUTHBRIDGE_AMD_AGESA_HUDSON select SOUTHBRIDGE_AMD_AGESA_HUDSON

4
src/mainboard/amd/thatcher/Kconfig.name
View File

@ -1,2 +1,2 @@
#config BOARD_AMD_THATCHER config BOARD_AMD_THATCHER
# bool"Thatcher" bool "Thatcher"

2
src/mainboard/amd/thatcher/Makefile.inc
View File

@ -13,6 +13,8 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
bootblock-y += bootblock.c
romstage-y += buildOpts.c romstage-y += buildOpts.c
romstage-y += BiosCallOuts.c romstage-y += BiosCallOuts.c
romstage-y += OemCustomize.c romstage-y += OemCustomize.c

38
src/mainboard/amd/thatcher/romstage.c → src/mainboard/amd/thatcher/bootblock.c
View File

@ -1,8 +1,6 @@
/* /*
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2012 Advanced Micro Devices, Inc.
*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. * the Free Software Foundation; version 2 of the License.
@ -13,42 +11,24 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <amdblocks/acpimmio.h>
#include <bootblock_common.h>
#include <stdint.h> #include <stdint.h>
#include <amdblocks/acpimmio.h>
#include <device/pci_def.h>
#include <arch/io.h>
#include <console/console.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <amdblocks/acpimmio.h> #include <console/console.h>
#include <northbridge/amd/agesa/state_machine.h>
#include <southbridge/amd/agesa/hudson/hudson.h>
#include <superio/smsc/lpc47n217/lpc47n217.h> #include <superio/smsc/lpc47n217/lpc47n217.h>
#define SERIAL_DEV PNP_DEV(0x2e, LPC47N217_SP1) #define SERIAL_DEV PNP_DEV(0x2e, LPC47N217_SP1)
void board_BeforeAgesa(struct sysinfo *cb) void bootblock_mainboard_early_init(void)
{ {
u8 byte;
pci_devfn_t dev;
/* Set LPC decode enables. */
dev = PCI_DEV(0, 0x14, 3);
byte = pci_read_config8(dev, 0x48);
byte |= 3; /* 2e, 2f */
pci_write_config8(dev, 0x48, byte);
post_code(0x30); post_code(0x30);
/* For serial port. */
pci_write_config32(dev, 0x44, 0xff03ffd5);
byte = pci_read_config8(dev, 0x48);
byte |= 3; /* 2e, 2f */
pci_write_config8(dev, 0x48, byte);
post_code(0x31); post_code(0x31);
lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
pm_io_write8(0x24, 1);
pm_io_write8(0xea, 1);
gpio_100_write8(0x1, 0x98); gpio_100_write8(0x1, 0x98);
/* Disable PCI-PCI bridge and release GPIO32/33 for other uses. */
pm_write8(0xea, 0x1);
lpc47n217_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
} }