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

asus/am1i-a: Switch away from ROMCC_BOOTBLOCK 

Switching was done by moving a SIO configuration and
the clocks setup from 'romstage.c' to 'bootblock.c',
following the example of change CB:37719 (fc749b2).

TEST=Boots into Artix Linux 2019 without a problem.

Signed-off-by: Mike Banon <mikebdp2@gmail.com>
Change-Id: I780fa87cb9cb3c45844c388331ef89eb8eb70ebb
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37829
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Mike Banon 2019-12-19 11:16:07 +03:00 committed by Kyösti Mälkki
parent 7a70a46ecc
commit 2bdc05d89b
4 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/asus/am1i-a/Kconfig
View File

@ -1,12 +1,8 @@
config BOARD_ASUS_AM1I_A
def_bool n
if BOARD_ASUS_AM1I_A if BOARD_ASUS_AM1I_A
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
#select ROMCC_BOOTBLOCK
select CPU_AMD_AGESA_FAMILY16_KB select CPU_AMD_AGESA_FAMILY16_KB
select FORCE_AM1_SOCKET_SUPPORT select FORCE_AM1_SOCKET_SUPPORT
select GFXUMA select GFXUMA

4
src/mainboard/asus/am1i-a/Kconfig.name
View File

@ -1,2 +1,2 @@
#config BOARD_ASUS_AM1I_A config BOARD_ASUS_AM1I_A
# bool"AM1I-A" bool "AM1I-A"

2
src/mainboard/asus/am1i-a/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

46
src/mainboard/asus/am1i-a/romstage.c → src/mainboard/asus/am1i-a/bootblock.c
View File

@ -1,10 +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.
* Copyright (C) 2015 Sergej Ivanov <getinaks@gmail.com>
* Copyright (C) 2018 Gergely Kiss <mail.gery@gmail.com>
*
* 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.
@ -15,12 +11,9 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/io.h> #include <amdblocks/acpimmio.h>
#include <bootblock_common.h>
#include <device/pnp_ops.h> #include <device/pnp_ops.h>
#include <device/pci_ops.h>
#include <northbridge/amd/agesa/state_machine.h>
#include <southbridge/amd/common/amd_defs.h>
#include <southbridge/amd/agesa/hudson/hudson.h>
#include <superio/ite/common/ite.h> #include <superio/ite/common/ite.h>
#include <superio/ite/it8623e/it8623e.h> #include <superio/ite/it8623e/it8623e.h>
@ -118,33 +111,12 @@ static void ite_gpio_conf(pnp_devfn_t dev)
ite_reg_write(dev, 0xfb, 0x00); ite_reg_write(dev, 0xfb, 0x00);
} }
void board_BeforeAgesa(struct sysinfo *cb) void bootblock_mainboard_early_init(void)
{ {
int i; volatile u32 i, val, *addr32;
u32 val;
u8 byte;
pci_devfn_t dev;
u32 *addr32;
/* 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);
/* Disable PCI-PCI bridge and release GPIO32/33 for other uses. */ /* Disable PCI-PCI bridge and release GPIO32/33 for other uses. */
outb(0xEA, 0xcd6); pm_write8(0xea, 0x1);
outb(0x1, 0xcd7);
/* Set LPC decode enables. */
pci_devfn_t dev2 = PCI_DEV(0, 0x14, 3);
pci_write_config32(dev2, 0x44, 0xff03ffd5);
/* Enable the AcpiMmio space */
outb(0x24, 0xcd6);
outb(0x1, 0xcd7);
/* Configure ClkDrvStr1 settings */ /* Configure ClkDrvStr1 settings */
addr32 = (u32 *)0xfed80e24; addr32 = (u32 *)0xfed80e24;
@ -154,15 +126,11 @@ void board_BeforeAgesa(struct sysinfo *cb)
addr32 = (u32 *)0xfed80e40; addr32 = (u32 *)0xfed80e40;
*addr32 = 0x000c4050; *addr32 = 0x000c4050;
/* enable SIO LPC decode */ /* Configure SIO as made under vendor BIOS */
dev = PCI_DEV(0, 0x14, 3);
byte = pci_read_config8(dev, 0x48);
byte |= 3; /* 2e, 2f & 4e, 4f */
pci_write_config8(dev, 0x48, byte);
ite_gpio_conf(GPIO_DEV); ite_gpio_conf(GPIO_DEV);
ite_evc_conf(ENVC_DEV); ite_evc_conf(ENVC_DEV);
/* Enable serial output on it8623e */
ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_48); ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_48);
ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
ite_kill_watchdog(GPIO_DEV); ite_kill_watchdog(GPIO_DEV);