summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/foster/Kconfig1
-rw-r--r--src/mainboard/google/smaug/Kconfig1
-rw-r--r--src/mainboard/iwave/iWRainbowG6/Kconfig1
-rw-r--r--src/mainboard/siemens/mc_tcu3/Kconfig1
-rw-r--r--src/northbridge/intel/haswell/Kconfig1
-rw-r--r--src/soc/intel/braswell/Kconfig6
-rw-r--r--src/soc/intel/broadwell/Kconfig2
-rw-r--r--src/soc/nvidia/tegra210/Kconfig4
8 files changed, 4 insertions, 13 deletions
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index 765efc792d..b8fe708be3 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select CHROMEOS_VBNV_FLASH
select SPI_FLASH
select SOC_NVIDIA_TEGRA210
- select MAINBOARD_HAS_BOOTBLOCK_INIT
select MAINBOARD_HAS_CHROMEOS
select VIRTUAL_DEV_SWITCH
select BOOTROM_SDRAM_INIT # use BootRom to config sdram
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 79bc732ce7..73a40e1d41 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SPI_FLASH
select SOC_NVIDIA_TEGRA210
select MAINBOARD_DO_DSI_INIT
- select MAINBOARD_HAS_BOOTBLOCK_INIT
select MAINBOARD_HAS_CHROMEOS
select VIRTUAL_DEV_SWITCH
select RAM_CODE_SUPPORT
diff --git a/src/mainboard/iwave/iWRainbowG6/Kconfig b/src/mainboard/iwave/iWRainbowG6/Kconfig
index 7bca220f81..5e92cfb7dd 100644
--- a/src/mainboard/iwave/iWRainbowG6/Kconfig
+++ b/src/mainboard/iwave/iWRainbowG6/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SOUTHBRIDGE_INTEL_SCH
select HAVE_PIRQ_TABLE
# select HAVE_MP_TABLE
- select USE_PRINTK_IN_CAR
select UDELAY_LAPIC
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
diff --git a/src/mainboard/siemens/mc_tcu3/Kconfig b/src/mainboard/siemens/mc_tcu3/Kconfig
index 9eb396b551..a4939bfc59 100644
--- a/src/mainboard/siemens/mc_tcu3/Kconfig
+++ b/src/mainboard/siemens/mc_tcu3/Kconfig
@@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_ROMSIZE_KB_16384
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
- select INCLUDE_MICROCODE_IN_BUILD
select ENABLE_BUILTIN_COM1
select HAVE_FSP_BIN if FSP_PACKAGE_DEFAULT
select ENABLE_FSP_FAST_BOOT
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig
index c5b80889fc..0a251b8a99 100644
--- a/src/northbridge/intel/haswell/Kconfig
+++ b/src/northbridge/intel/haswell/Kconfig
@@ -21,7 +21,6 @@ config NORTHBRIDGE_INTEL_HASWELL
bool
select CACHE_MRC_BIN
select CPU_INTEL_HASWELL
- select REQUIRES_BLOB
select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT
select INTEL_DDI
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