[coreboot-gerrit] Change in coreboot[master]: [WIP] src/soc/intel/apollolake: Unify name for uart debug config flag
Bora Guvendik (Code Review)
gerrit at coreboot.org
Sat Apr 28 01:32:31 CEST 2018
Bora Guvendik has uploaded this change for review. ( https://review.coreboot.org/25904
Change subject: [WIP] src/soc/intel/apollolake: Unify name for uart debug config flag
......................................................................
[WIP] src/soc/intel/apollolake: Unify name for uart debug config flag
Big core defined CONFIG_UART_DEBUG and small core defined it as
CONFIG_SOC_UART_DEBUG. Change small core to use CONFIG_UART_DEBUG
as well so that common code for big/small cores can take advantage
of it.
Change-Id: I0db5b034fa8cf62141ab16e916df21f941e1c2ae
Signed-off-by: Bora Guvendik <bora.guvendik at intel.com>
---
M src/mainboard/intel/leafhill/Kconfig
M src/mainboard/intel/minnow3/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/apollolake/Makefile.inc
M src/soc/intel/apollolake/romstage.c
M src/soc/intel/apollolake/uart.c
6 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/25904/1
diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig
index c344615..1e5d5aa 100644
--- a/src/mainboard/intel/leafhill/Kconfig
+++ b/src/mainboard/intel/leafhill/Kconfig
@@ -55,7 +55,7 @@
depends on NEED_IFWI
default y
-config SOC_UART_DEBUG
+config UART_DEBUG
bool "use serial port debugging"
default y
diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig
index 76c9343..5b065ed 100644
--- a/src/mainboard/intel/minnow3/Kconfig
+++ b/src/mainboard/intel/minnow3/Kconfig
@@ -47,7 +47,7 @@
depends on NEED_IFWI
default y
-config SOC_UART_DEBUG
+config UART_DEBUG
bool "use serial port debugging"
default y
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index a5842ec..3cb3e7a 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -175,8 +175,8 @@
hex
default 0xde000000
-config SOC_UART_DEBUG
- bool "Enable SoC UART debug port selected by UART_FOR_CONSOLE."
+config UART_DEBUG
+ bool "Enable UART debug port selected by UART_FOR_CONSOLE."
default n
select CONSOLE_SERIAL
select DRIVERS_UART
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 854f328..0e2aaeb 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -18,7 +18,7 @@
bootblock-y += mmap_boot.c
bootblock-y += pmutil.c
bootblock-y += spi.c
-bootblock-$(CONFIG_SOC_UART_DEBUG) += uart.c
+bootblock-$(CONFIG_UART_DEBUG) += uart.c
bootblock-$(CONFIG_FSP_CAR) += bootblock/cache_as_ram_fsp.S
romstage-y += car.c
@@ -26,7 +26,7 @@
romstage-y += gspi.c
romstage-y += heci.c
romstage-y += i2c.c
-romstage-$(CONFIG_SOC_UART_DEBUG) += uart.c
+romstage-$(CONFIG_UART_DEBUG) += uart.c
romstage-y += memmap.c
romstage-y += meminit.c
ifeq ($(CONFIG_SOC_INTEL_GLK),y)
@@ -43,7 +43,7 @@
smm-y += pmutil.c
smm-y += smihandler.c
smm-y += spi.c
-smm-$(CONFIG_SOC_UART_DEBUG) += uart.c
+smm-$(CONFIG_UART_DEBUG) += uart.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
ramstage-y += cpu.c
@@ -57,7 +57,7 @@
ramstage-y += lpc.c
ramstage-y += memmap.c
ramstage-y += mmap_boot.c
-ramstage-$(CONFIG_SOC_UART_DEBUG) += uart.c
+ramstage-$(CONFIG_UART_DEBUG) += uart.c
ramstage-y += nhlt.c
ramstage-y += spi.c
ramstage-y += systemagent.c
@@ -71,7 +71,7 @@
postcar-y += memmap.c
postcar-y += mmap_boot.c
postcar-y += spi.c
-postcar-$(CONFIG_SOC_UART_DEBUG) += uart.c
+postcar-$(CONFIG_UART_DEBUG) += uart.c
postcar-$(CONFIG_FSP_CAR) += exit_car_fsp.S
@@ -81,7 +81,7 @@
verstage-y += heci.c
verstage-y += memmap.c
verstage-y += mmap_boot.c
-verstage-$(CONFIG_SOC_UART_DEBUG) += uart.c
+verstage-$(CONFIG_UART_DEBUG) += uart.c
verstage-y += pmutil.c
verstage-y += reset.c
verstage-y += spi.c
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index a8a0dd1..755f936 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -251,7 +251,7 @@
static void fill_console_params(FSPM_UPD *mupd)
{
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {
- if (IS_ENABLED(CONFIG_SOC_UART_DEBUG)) {
+ if (IS_ENABLED(CONFIG_UART_DEBUG)) {
mupd->FspmConfig.SerialDebugPortDevice =
CONFIG_UART_FOR_CONSOLE;
/* use MMIO port type */
diff --git a/src/soc/intel/apollolake/uart.c b/src/soc/intel/apollolake/uart.c
index 54b280d..0fce587 100644
--- a/src/soc/intel/apollolake/uart.c
+++ b/src/soc/intel/apollolake/uart.c
@@ -81,7 +81,7 @@
{
pci_dev_read_resources(dev);
- if (IS_ENABLED(CONFIG_SOC_UART_DEBUG) &&
+ if (IS_ENABLED(CONFIG_UART_DEBUG) &&
uart_is_debug_controller(dev)) {
/* will override existing resource. */
fixed_mem_resource(dev, PCI_BASE_ADDRESS_0,
--
To view, visit https://review.coreboot.org/25904
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0db5b034fa8cf62141ab16e916df21f941e1c2ae
Gerrit-Change-Number: 25904
Gerrit-PatchSet: 1
Gerrit-Owner: Bora Guvendik <bora.guvendik at intel.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180427/2d50d686/attachment-0001.html>
More information about the coreboot-gerrit
mailing list