summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/braswell/Kconfig6
-rw-r--r--src/soc/intel/broadwell/Kconfig2
-rw-r--r--src/soc/nvidia/tegra210/Kconfig4
3 files changed, 4 insertions, 8 deletions
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index dac38cec14..5b6fa109e1 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -14,12 +14,9 @@ config CPU_SPECIFIC_OPTIONS
select BACKUP_DEFAULT_SMM_REGION
select CACHE_MRC_SETTINGS
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
- select CACHE_ROM
- select CAR_MIGRATION
select COLLECT_TIMESTAMPS
- select CPU_MICROCODE_IN_CBFS
+ select SUPPORT_CPU_UCODE_IN_CBFS
select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
- select DYNAMIC_CBMEM
select ENABLE_MRC_CACHE
select HAS_PRECBMEM_TIMESTAMP_REGION
select HAVE_MONOTONIC_TIMER
@@ -39,7 +36,6 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_RESET
select SOC_INTEL_COMMON_STACK
select SOC_INTEL_COMMON_STAGE_CACHE
- select SMM_MODULES
select SMM_TSEG
select SMP
select SPI_FLASH
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 6ad9113018..5da8a3354c 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -160,7 +160,7 @@ config RESET_ON_INVALID_RAMSTAGE_CACHE
config INTEL_PCH_UART_CONSOLE
bool "Use Serial IO UART for console"
default n
- select CONSOLE_SERIAL8250MEM
+ select DRIVERS_UART_8250MEM
config INTEL_PCH_UART_CONSOLE_NUMBER
hex "Serial IO UART number to use for console"
diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig
index 9a707fad63..7aa932aa08 100644
--- a/src/soc/nvidia/tegra210/Kconfig
+++ b/src/soc/nvidia/tegra210/Kconfig
@@ -50,7 +50,7 @@ config MAX_CPUS
choice CONSOLE_SERIAL_TEGRA210_UART_CHOICES
prompt "Serial Console UART"
default CONSOLE_SERIAL_TEGRA210_UARTA
- depends on CONSOLE_SERIAL_UART
+ depends on CONSOLE_SERIAL
config CONSOLE_SERIAL_TEGRA210_UARTA
bool "UARTA"
@@ -81,7 +81,7 @@ endchoice
config CONSOLE_SERIAL_TEGRA210_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on CONSOLE_SERIAL
default 0x70006000 if CONSOLE_SERIAL_TEGRA210_UARTA
default 0x70006040 if CONSOLE_SERIAL_TEGRA210_UARTB
default 0x70006200 if CONSOLE_SERIAL_TEGRA210_UARTC