sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/apollolake: group serial console options into one Kconfig

Browse Source 
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@chormium.org>
Reviewed-on: https://review.coreboot.org/13790
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Andrey Petrov <andrey.petrov@intel.com>
This commit is contained in:
Aaron Durbin
2016-02-24 18:49:07 -06:00
parent a7141c518a
commit 6181030ba6
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/soc/intel/apollolake/Kconfig
View File

@@ -32,13 +32,9 @@ config CPU_SPECIFIC_OPTIONS
select RELOCATABLE_RAMSTAGE # Build fails if this is not selected select RELOCATABLE_RAMSTAGE # Build fails if this is not selected
select SOC_INTEL_COMMON select SOC_INTEL_COMMON
select UDELAY_TSC select UDELAY_TSC
select CONSOLE_SERIAL
select BOOTBLOCK_CONSOLE
select TSC_CONSTANT_RATE select TSC_CONSTANT_RATE
select UDELAY_TSC select UDELAY_TSC
select TSC_CONSTANT_RATE select TSC_CONSTANT_RATE
select NO_UART_ON_SUPERIO
select DRIVERS_UART_8250MEM_32
config MMCONF_BASE_ADDRESS config MMCONF_BASE_ADDRESS
hex "PCI MMIO Base Address" hex "PCI MMIO Base Address"
@@ -75,6 +71,15 @@ config CONSOLE_UART_BASE_ADDRESS
hex "MMIO base address for UART" hex "MMIO base address for UART"
default 0xde000000 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. # 32KiB bootblock is all that is mapped in by the CSE at top of 4GiB.
config C_ENV_BOOTBLOCK_SIZE config C_ENV_BOOTBLOCK_SIZE
hex hex

6
src/soc/intel/apollolake/Makefile.inc
View File

@@ -13,16 +13,16 @@ bootblock-y += bootblock/bootblock.c
bootblock-y += gpio.c bootblock-y += gpio.c
bootblock-y += placeholders.c bootblock-y += placeholders.c
bootblock-y += tsc_freq.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 += placeholders.c
romstage-y += gpio.c romstage-y += gpio.c
romstage-y += uart_early.c romstage-$(CONFIG_SOC_UART_DEBUG) += uart_early.c
smm-y += placeholders.c smm-y += placeholders.c
ramstage-y += placeholders.c ramstage-y += placeholders.c
ramstage-y += gpio.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 CPPFLAGS_common += -I$(src)/soc/intel/apollolake/include