summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorSergej Ivanov <getinaks@gmail.com>2019-12-13 23:04:47 +0000
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-12-16 16:17:36 +0000
commitfc749b23ef41f6bb63370d1377bcdaac250848f6 (patch)
tree2b2b7e95ceb10810ed5fa6e855f72814e030e23e /src/mainboard
parent9c6e9c684f0b3770c9c08586985993750b5cb3b9 (diff)
downloadcoreboot-fc749b23ef41f6bb63370d1377bcdaac250848f6.tar.xz
biostar/am1ml: Switch away from ROMCC_BOOTBLOCK
Switching was done by moving a SIO configuration and a clocks setup from 'romstage.c' to 'bootblock.c' TEST=Boots into Ubuntu Linux 16.04.6 without a problem. Change-Id: I7a972b531183b08af7b325bd686cf3eb7558082f Signed-off-by: Sergej Ivanov <getinaks@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37719 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/biostar/Kconfig3
-rw-r--r--src/mainboard/biostar/am1ml/Kconfig4
-rw-r--r--src/mainboard/biostar/am1ml/Kconfig.name4
-rw-r--r--src/mainboard/biostar/am1ml/Makefile.inc2
-rw-r--r--src/mainboard/biostar/am1ml/bootblock.c (renamed from src/mainboard/biostar/am1ml/romstage.c)70
5 files changed, 14 insertions, 69 deletions
diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig
index 6469d4e6b5..43896a3f1f 100644
--- a/src/mainboard/biostar/Kconfig
+++ b/src/mainboard/biostar/Kconfig
@@ -20,9 +20,6 @@ choice
source "src/mainboard/biostar/*/Kconfig.name"
-config BIOSTAR_BOARDS_DISABLED
- bool "Boards from vendor are disabled"
-
endchoice
source "src/mainboard/biostar/*/Kconfig"
diff --git a/src/mainboard/biostar/am1ml/Kconfig b/src/mainboard/biostar/am1ml/Kconfig
index 866fc66e5d..9eaa6fb98c 100644
--- a/src/mainboard/biostar/am1ml/Kconfig
+++ b/src/mainboard/biostar/am1ml/Kconfig
@@ -14,15 +14,11 @@
# GNU General Public License for more details.
#
-config BOARD_BIOSTAR_AM1ML
- def_bool n
-
if BOARD_BIOSTAR_AM1ML
config BOARD_SPECIFIC_OPTIONS
def_bool y
select BOARD_ROMSIZE_KB_4096
- #select ROMCC_BOOTBLOCK
select CPU_AMD_AGESA_FAMILY16_KB
select FORCE_AM1_SOCKET_SUPPORT
select GFXUMA
diff --git a/src/mainboard/biostar/am1ml/Kconfig.name b/src/mainboard/biostar/am1ml/Kconfig.name
index 0980c2e85d..da7a677c9e 100644
--- a/src/mainboard/biostar/am1ml/Kconfig.name
+++ b/src/mainboard/biostar/am1ml/Kconfig.name
@@ -1,2 +1,2 @@
-#config BOARD_BIOSTAR_AM1ML
-# bool"AM1ML"
+config BOARD_BIOSTAR_AM1ML
+ bool"AM1ML"
diff --git a/src/mainboard/biostar/am1ml/Makefile.inc b/src/mainboard/biostar/am1ml/Makefile.inc
index f8895faa92..4dde2cfd1e 100644
--- a/src/mainboard/biostar/am1ml/Makefile.inc
+++ b/src/mainboard/biostar/am1ml/Makefile.inc
@@ -13,6 +13,8 @@
# GNU General Public License for more details.
#
+bootblock-y += bootblock.c
+
romstage-y += buildOpts.c
romstage-y += BiosCallOuts.c
romstage-y += OemCustomize.c
diff --git a/src/mainboard/biostar/am1ml/romstage.c b/src/mainboard/biostar/am1ml/bootblock.c
index 6c1581bbcb..f198fe6809 100644
--- a/src/mainboard/biostar/am1ml/romstage.c
+++ b/src/mainboard/biostar/am1ml/bootblock.c
@@ -1,26 +1,19 @@
/*
* This file is part of the coreboot project.
*
- * Copyright (C) 2012 Advanced Micro Devices, Inc.
- * Copyright (C) 2015 Sergej Ivanov <getinaks@gmail.com>
- *
* 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
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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/pci_ops.h>
-#include <console/console.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/it8728f/it8728f.h>
@@ -28,10 +21,6 @@
#define GPIO_DEV PNP_DEV(0x2e, IT8728F_GPIO)
#define ENVC_DEV PNP_DEV(0x2e, IT8728F_EC)
-#define MMIO_NON_POSTED_START 0xfed00000
-#define MMIO_NON_POSTED_END 0xfedfffff
-#define SB_MMIO_MISC32(x) *(volatile u32 *)(AMD_SB_ACPI_MMIO_ADDR + 0xE00 + (x))
-
static void ite_evc_conf(pnp_devfn_t dev)
{
pnp_enter_conf_state(dev);
@@ -70,28 +59,13 @@ static void ite_gpio_conf(pnp_devfn_t dev)
pnp_exit_conf_state(dev);
}
-void board_BeforeAgesa(struct sysinfo *cb)
+void bootblock_mainboard_early_init(void)
{
- u32 val, t32;
- 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);
+ volatile u32 *addr32;
+ u32 t32;
- /* 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);
+ /* Disable PCI-PCI bridge and release GPIO32/33 for other uses. */
+ pm_write8(0xea, 0x1);
/* Set auxiliary output clock frequency on OSCOUT1 pin to be 48MHz */
addr32 = (u32 *)0xfed80e28;
@@ -105,35 +79,11 @@ void board_BeforeAgesa(struct sysinfo *cb)
t32 &= 0xffffbffb;
*addr32 = t32;
- /* enable SIO LPC decode */
- dev = PCI_DEV(0, 0x14, 3);
- byte = pci_read_config8(dev, 0x48);
- byte |= 3; /* 2e, 2f */
- pci_write_config8(dev, 0x48, byte);
-
- /* enable serial decode */
- byte = pci_read_config8(dev, 0x44);
- byte |= (1 << 6); /* 0x3f8 */
- pci_write_config8(dev, 0x44, byte);
-
- /* This functions configure SIO as it been done under vendor bios */
- printk(BIOS_DEBUG, "ITE CONFIG ENVC\n");
+ /* Configure SIO as made under vendor BIOS */
ite_evc_conf(ENVC_DEV);
- printk(BIOS_DEBUG, "ITE CONFIG GPIO\n");
ite_gpio_conf(GPIO_DEV);
- printk(BIOS_DEBUG, "ITE CONFIG DONE\n");
-
+ /* Enable serial output on it8728f */
ite_kill_watchdog(GPIO_DEV);
ite_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-
- /* 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);
-
- outb(0xEA, 0xCD6);
- outb(0x1, 0xcd7);
-
- post_code(0x50);
}