[coreboot-gerrit] Patch set updated for coreboot: soc/intel/apollolake: group serial console options into one Kconfig
Aaron Durbin (adurbin@chromium.org)
gerrit at coreboot.org
Thu Feb 25 02:59:07 CET 2016
Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13790
-gerrit
commit ef1ea438c45ac76237e4dde0e941cfd88a2c646a
Author: Aaron Durbin <adurbin at chromium.org>
Date: Wed Feb 24 18:49:07 2016 -0600
soc/intel/apollolake: group serial console options into one Kconfig
Add SOC_UART_DEBUG which does all the appropriate selection of the
dependent Kconfig options for seral console. Also provide a default
option of it being turned off instead of always selected.
Change-Id: I1a6dba9c0072a17859c8f389709afe6fe3b04fac
Signed-off-by: Aaron Durbin <adurbin at chormium.org>
---
src/soc/intel/apollolake/Kconfig | 13 +++++++++----
src/soc/intel/apollolake/Makefile.inc | 6 +++---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index bb0cc20..c32b80f 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -32,13 +32,9 @@ config CPU_SPECIFIC_OPTIONS
select RELOCATABLE_RAMSTAGE # Build fails if this is not selected
select SOC_INTEL_COMMON
select UDELAY_TSC
- select CONSOLE_SERIAL
- select BOOTBLOCK_CONSOLE
select TSC_CONSTANT_RATE
select UDELAY_TSC
select TSC_CONSTANT_RATE
- select NO_UART_ON_SUPERIO
- select DRIVERS_UART_8250MEM_32
config MMCONF_BASE_ADDRESS
hex "PCI MMIO Base Address"
@@ -75,6 +71,15 @@ config CONSOLE_UART_BASE_ADDRESS
hex "MMIO base address for UART"
default 0xde000000
+config SOC_UART_DEBUG
+ bool "Enable SoC UART debug port selected by UART_FOR_CONSOLE."
+ default n
+ select CONSOLE_SERIAL
+ select BOOTBLOCK_CONSOLE
+ select DRIVERS_UART
+ select DRIVERS_UART_8250MEM_32
+ select NO_UART_ON_SUPERIO
+
# 32KiB bootblock is all that is mapped in by the CSE at top of 4GiB.
config C_ENV_BOOTBLOCK_SIZE
hex
diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc
index 7f8beb0..76fa4c7 100644
--- a/src/soc/intel/apollolake/Makefile.inc
+++ b/src/soc/intel/apollolake/Makefile.inc
@@ -13,16 +13,16 @@ bootblock-y += bootblock/bootblock.c
bootblock-y += gpio.c
bootblock-y += placeholders.c
bootblock-y += tsc_freq.c
-bootblock-y += uart_early.c
+bootblock-$(CONFIG_SOC_UART_DEBUG) += uart_early.c
romstage-y += placeholders.c
romstage-y += gpio.c
-romstage-y += uart_early.c
+romstage-$(CONFIG_SOC_UART_DEBUG) += uart_early.c
smm-y += placeholders.c
ramstage-y += placeholders.c
ramstage-y += gpio.c
-ramstage-y += uart_early.c
+ramstage-$(CONFIG_SOC_UART_DEBUG) += uart_early.c
CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include
More information about the coreboot-gerrit
mailing list