<p>Bora Guvendik has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25904">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[WIP] src/soc/intel/apollolake: Unify name for uart debug config flag<br><br>Big core defined CONFIG_UART_DEBUG and small core defined it as<br>CONFIG_SOC_UART_DEBUG. Change small core to use CONFIG_UART_DEBUG<br>as well so that common code for big/small cores can take advantage<br>of it.<br><br>Change-Id: I0db5b034fa8cf62141ab16e916df21f941e1c2ae<br>Signed-off-by: Bora Guvendik <bora.guvendik@intel.com><br>---<br>M src/mainboard/intel/leafhill/Kconfig<br>M src/mainboard/intel/minnow3/Kconfig<br>M src/soc/intel/apollolake/Kconfig<br>M src/soc/intel/apollolake/Makefile.inc<br>M src/soc/intel/apollolake/romstage.c<br>M src/soc/intel/apollolake/uart.c<br>6 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/25904/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig</span><br><span>index c344615..1e5d5aa 100644</span><br><span>--- a/src/mainboard/intel/leafhill/Kconfig</span><br><span>+++ b/src/mainboard/intel/leafhill/Kconfig</span><br><span>@@ -55,7 +55,7 @@</span><br><span> depends on NEED_IFWI</span><br><span> default y</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config SOC_UART_DEBUG</span><br><span style="color: hsl(120, 100%, 40%);">+config UART_DEBUG</span><br><span> bool "use serial port debugging"</span><br><span> default y</span><br><span> </span><br><span>diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig</span><br><span>index 76c9343..5b065ed 100644</span><br><span>--- a/src/mainboard/intel/minnow3/Kconfig</span><br><span>+++ b/src/mainboard/intel/minnow3/Kconfig</span><br><span>@@ -47,7 +47,7 @@</span><br><span> depends on NEED_IFWI</span><br><span> default y</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config SOC_UART_DEBUG</span><br><span style="color: hsl(120, 100%, 40%);">+config UART_DEBUG</span><br><span> bool "use serial port debugging"</span><br><span> default y</span><br><span> </span><br><span>diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig</span><br><span>index a5842ec..3cb3e7a 100644</span><br><span>--- a/src/soc/intel/apollolake/Kconfig</span><br><span>+++ b/src/soc/intel/apollolake/Kconfig</span><br><span>@@ -175,8 +175,8 @@</span><br><span> hex</span><br><span> default 0xde000000</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-config SOC_UART_DEBUG</span><br><span style="color: hsl(0, 100%, 40%);">- bool "Enable SoC UART debug port selected by UART_FOR_CONSOLE."</span><br><span style="color: hsl(120, 100%, 40%);">+config UART_DEBUG</span><br><span style="color: hsl(120, 100%, 40%);">+ bool "Enable UART debug port selected by UART_FOR_CONSOLE."</span><br><span> default n</span><br><span> select CONSOLE_SERIAL</span><br><span> select DRIVERS_UART</span><br><span>diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc</span><br><span>index 854f328..0e2aaeb 100644</span><br><span>--- a/src/soc/intel/apollolake/Makefile.inc</span><br><span>+++ b/src/soc/intel/apollolake/Makefile.inc</span><br><span>@@ -18,7 +18,7 @@</span><br><span> bootblock-y += mmap_boot.c</span><br><span> bootblock-y += pmutil.c</span><br><span> bootblock-y += spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_SOC_UART_DEBUG) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> bootblock-$(CONFIG_FSP_CAR) += bootblock/cache_as_ram_fsp.S</span><br><span> </span><br><span> romstage-y += car.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> romstage-y += gspi.c</span><br><span> romstage-y += heci.c</span><br><span> romstage-y += i2c.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_SOC_UART_DEBUG) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> romstage-y += memmap.c</span><br><span> romstage-y += meminit.c</span><br><span> ifeq ($(CONFIG_SOC_INTEL_GLK),y)</span><br><span>@@ -43,7 +43,7 @@</span><br><span> smm-y += pmutil.c</span><br><span> smm-y += smihandler.c</span><br><span> smm-y += spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-smm-$(CONFIG_SOC_UART_DEBUG) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+smm-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> </span><br><span> ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c</span><br><span> ramstage-y += cpu.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> ramstage-y += lpc.c</span><br><span> ramstage-y += memmap.c</span><br><span> ramstage-y += mmap_boot.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_SOC_UART_DEBUG) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> ramstage-y += nhlt.c</span><br><span> ramstage-y += spi.c</span><br><span> ramstage-y += systemagent.c</span><br><span>@@ -71,7 +71,7 @@</span><br><span> postcar-y += memmap.c</span><br><span> postcar-y += mmap_boot.c</span><br><span> postcar-y += spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-postcar-$(CONFIG_SOC_UART_DEBUG) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+postcar-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> </span><br><span> postcar-$(CONFIG_FSP_CAR) += exit_car_fsp.S</span><br><span> </span><br><span>@@ -81,7 +81,7 @@</span><br><span> verstage-y += heci.c</span><br><span> verstage-y += memmap.c</span><br><span> verstage-y += mmap_boot.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_SOC_UART_DEBUG) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> verstage-y += pmutil.c</span><br><span> verstage-y += reset.c</span><br><span> verstage-y += spi.c</span><br><span>diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c</span><br><span>index a8a0dd1..755f936 100644</span><br><span>--- a/src/soc/intel/apollolake/romstage.c</span><br><span>+++ b/src/soc/intel/apollolake/romstage.c</span><br><span>@@ -251,7 +251,7 @@</span><br><span> static void fill_console_params(FSPM_UPD *mupd)</span><br><span> {</span><br><span> if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (IS_ENABLED(CONFIG_SOC_UART_DEBUG)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_UART_DEBUG)) {</span><br><span> mupd->FspmConfig.SerialDebugPortDevice =</span><br><span> CONFIG_UART_FOR_CONSOLE;</span><br><span> /* use MMIO port type */</span><br><span>diff --git a/src/soc/intel/apollolake/uart.c b/src/soc/intel/apollolake/uart.c</span><br><span>index 54b280d..0fce587 100644</span><br><span>--- a/src/soc/intel/apollolake/uart.c</span><br><span>+++ b/src/soc/intel/apollolake/uart.c</span><br><span>@@ -81,7 +81,7 @@</span><br><span> {</span><br><span> pci_dev_read_resources(dev);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (IS_ENABLED(CONFIG_SOC_UART_DEBUG) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ if (IS_ENABLED(CONFIG_UART_DEBUG) &&</span><br><span> uart_is_debug_controller(dev)) {</span><br><span> /* will override existing resource. */</span><br><span> fixed_mem_resource(dev, PCI_BASE_ADDRESS_0,</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25904">change 25904</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/25904"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0db5b034fa8cf62141ab16e916df21f941e1c2ae </div>
<div style="display:none"> Gerrit-Change-Number: 25904 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Bora Guvendik <bora.guvendik@intel.com> </div>