aboutsummaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2015-07-01 23:09:42 -0600
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-07-04 23:41:05 +0200
commitdf02c338ef601d1c0fed6e5d8767bf5c5c835507 (patch)
tree68399f5a1130102bbca68214caa3c5db526908b7 /src/soc
parent8c2f39714f4d6b8f2ab9692669474fb5ada3ed37 (diff)
Kconfig: Fix references to obsolete symbols
These are all Kconfig symbols that have been removed or renamed. USE_PRINTK_IN_CAR was removed in commit 8c4f31b3 Drop the USE_PRINTK_IN_CAR option. It's a bogus decision... DYNAMIC_CBMEM was removed in commit e2b0affd Remove Kconfig variable that has no effect MAINBOARD_HAS_BOOTBLOCK_INIT was removed in commit 342535cc Remove Kconfig variable that has no effect CACHE_ROM was removed in commit 4337020b Remove CACHE_ROM. SMM_MODULES was removed in commit 44cbe10f smm: Merge configs SMM_MODULES and SMM_TSEG INCLUDE_MICROCODE_IN_BUILD was removed in commit eb73a218 soc/fsp_baytrail: Fix use of microcode-related Kconfig variables CAR_MIGRATION was removed in commit cbf5bdfe CBMEM: Always select CAR_MIGRATION REQUIRES_BLOB was removed in commit 70c85eab build system: Retire REQUIRES_BLOB CPU_MICROCODE_IN_CBFS was renamed to SUPPORT_CPU_UCODE_IN_CBFS in commit 66e0c4c8 - cpu: Rename CPU_MICROCODE_IN_CBFS to SUPPORT_CPU_UCODE_IN_CBFS CONSOLE_SERIAL_UART was renamed to CONSOLE_SERIAL in commit afa7b13b uart: Redefine Kconfig options CONSOLE_SERIAL8250MEM was renamed to DRIVERS_UART_8250MEM in commit afa7b13b - uart: Redefine Kconfig options Change-Id: I8952ca8c53ac2e6cec5f9c77d2f413f086bfab9d Signed-off-by: Martin Roth <gaumless@gmail.com> Reviewed-on: http://review.coreboot.org/10766 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
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