summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2016-05-30 14:35:15 -0700
committerLeroy P Leahy <leroy.p.leahy@intel.com>2016-05-31 22:10:56 +0200
commitac78db3a53a7653a73409936455d68c754291e9d (patch)
tree74b89328d2678996dbdee610ad3c1fa9c148de3a
parentfd91dee42001cd055d5a51c13750c8e1abc0e7e1 (diff)
downloadcoreboot-ac78db3a53a7653a73409936455d68c754291e9d.tar.xz
soc/intel/quark: Move UART init into romstage.c
Move UART initialization into romstage.c and eliminate uart.c. TEST=Build and run on Galileo Gen2 Change-Id: I5f2c9b4c566008000c2201c422a0bba63da64487 Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com> Reviewed-on: https://review.coreboot.org/15009 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/soc/intel/quark/include/soc/pci_devs.h1
-rw-r--r--src/soc/intel/quark/romstage/Makefile.inc1
-rw-r--r--src/soc/intel/quark/romstage/romstage.c10
-rw-r--r--src/soc/intel/quark/romstage/uart.c42
4 files changed, 9 insertions, 45 deletions
diff --git a/src/soc/intel/quark/include/soc/pci_devs.h b/src/soc/intel/quark/include/soc/pci_devs.h
index ff9d65f6ef..278a012d11 100644
--- a/src/soc/intel/quark/include/soc/pci_devs.h
+++ b/src/soc/intel/quark/include/soc/pci_devs.h
@@ -38,6 +38,7 @@
#define EHCI_FUNC 3
#define OHCI_FUNC 4
#define HSUART1_FUNC 5
+#define HSUART1_BDF PCI_DEV(PCI_BUS_NUMBER_QNC, HSUART1_DEV, HSUART1_FUNC)
/* IO Fabric 2 */
#define SIO2_DEV 0x15
diff --git a/src/soc/intel/quark/romstage/Makefile.inc b/src/soc/intel/quark/romstage/Makefile.inc
index 2f29b06a70..6c92ac4474 100644
--- a/src/soc/intel/quark/romstage/Makefile.inc
+++ b/src/soc/intel/quark/romstage/Makefile.inc
@@ -20,4 +20,3 @@ romstage-y += mtrr.c
romstage-y += pcie.c
romstage-y += report_platform.c
romstage-y += romstage.c
-romstage-$(CONFIG_ENABLE_BUILTIN_HSUART1) += uart.c
diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c
index c86c2eae3d..5be022a8d6 100644
--- a/src/soc/intel/quark/romstage/romstage.c
+++ b/src/soc/intel/quark/romstage/romstage.c
@@ -58,11 +58,17 @@ static const struct reg_script i2c_gpio_controller_init[] = {
REG_SCRIPT_END
};
+static const struct reg_script hsuart_init[] = {
+ /* Enable the HSUART */
+ REG_PCI_WRITE32(PCI_BASE_ADDRESS_0, UART_BASE_ADDRESS),
+ REG_PCI_OR8(PCI_COMMAND, PCI_COMMAND_MEMORY),
+ REG_SCRIPT_END
+};
+
void car_soc_pre_console_init(void)
{
if (IS_ENABLED(CONFIG_ENABLE_BUILTIN_HSUART1))
- set_base_address_and_enable_uart(0, HSUART1_DEV, HSUART1_FUNC,
- UART_BASE_ADDRESS);
+ reg_script_run_on_dev(HSUART1_BDF, hsuart_init);
}
void car_soc_post_console_init(void)
diff --git a/src/soc/intel/quark/romstage/uart.c b/src/soc/intel/quark/romstage/uart.c
deleted file mode 100644
index 9e8f6c529b..0000000000
--- a/src/soc/intel/quark/romstage/uart.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2003 Eric Biederman
- * Copyright (C) 2006-2010 coresystems GmbH
- * Copyright (C) 2015-2016 Intel Corporation.
- *
- * 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
- * GNU General Public License for more details.
- */
-
-// Use simple device model for this file even in ramstage
-#define __SIMPLE_DEVICE__
-
-#include <device/pci.h>
-#include <device/pci_def.h>
-#include <rules.h>
-#include <soc/romstage.h>
-
-int set_base_address_and_enable_uart(u8 bus, u8 dev, u8 func, u32 mmio_base)
-{
- uint16_t reg16;
-
- /* HSUART controller #1 (B0:D20:F5). */
- pci_devfn_t uart_bdf = PCI_DEV(bus, dev, func);
-
- /* Decode BAR0(offset 0x10). */
- pci_write_config32(uart_bdf, PCI_BASE_ADDRESS_0, mmio_base);
-
- /* Enable MEMBASE at CMD(offset 0x04). */
- reg16 = pci_read_config16(uart_bdf, PCI_COMMAND);
- reg16 |= PCI_COMMAND_MEMORY;
- pci_write_config16(uart_bdf, PCI_COMMAND, reg16);
-
- return 0;
-}