diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-05-08 15:27:15 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-05-10 11:27:25 +0200 |
| commit | 5c3f384f064f5c05945d561784fd7e8ef002a295 (patch) | |
| tree | 11c5dbbbdf50b76999df1cee63dd40d5cf5a3c68 /src/cpu/intel | |
| parent | a7e2cc507b520583fe2e727371e431d65924ee53 (diff) | |
Replace SERIAL_CPU_INIT with PARALLEL_CPU_INIT
Lines with 'select SERIAL_CPU_INIT' where redundant with the
default being yes. Since there is no 'unselect SERIAL_CPU_INIT'
possibility, invert the default and rename option.
This squelches Kconfig warnings about unmet dependencies.
Change-Id: Iae546c56006278489ebae10f2daa627af48abe94
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5700
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/cpu/intel')
| -rw-r--r-- | src/cpu/intel/fsp_model_206ax/Kconfig | 5 | ||||
| -rw-r--r-- | src/cpu/intel/haswell/Kconfig | 5 | ||||
| -rw-r--r-- | src/cpu/intel/hyperthreading/intel_sibling.c | 2 | ||||
| -rw-r--r-- | src/cpu/intel/model_2065x/Kconfig | 5 | ||||
| -rw-r--r-- | src/cpu/intel/model_206ax/Kconfig | 5 |
5 files changed, 5 insertions, 17 deletions
diff --git a/src/cpu/intel/fsp_model_206ax/Kconfig b/src/cpu/intel/fsp_model_206ax/Kconfig index 1db5030013..0fb4437cbd 100644 --- a/src/cpu/intel/fsp_model_206ax/Kconfig +++ b/src/cpu/intel/fsp_model_206ax/Kconfig @@ -37,16 +37,13 @@ config CPU_SPECIFIC_OPTIONS select UDELAY_LAPIC select SMM_TSEG select SUPPORT_CPU_UCODE_IN_CBFS if HAVE_FSP_BIN + select PARALLEL_CPU_INIT select TSC_SYNC_MFENCE config BOOTBLOCK_CPU_INIT string default "cpu/intel/fsp_model_206ax/bootblock.c" -config SERIAL_CPU_INIT - bool - default n - config SMM_TSEG_SIZE hex default 0x800000 diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig index 60c2066b7e..fa02cba2eb 100644 --- a/src/cpu/intel/haswell/Kconfig +++ b/src/cpu/intel/haswell/Kconfig @@ -22,16 +22,13 @@ config CPU_SPECIFIC_OPTIONS #select AP_IN_SIPI_WAIT select TSC_SYNC_MFENCE select CPU_INTEL_FIRMWARE_INTERFACE_TABLE + select PARALLEL_CPU_INIT select PARALLEL_MP config BOOTBLOCK_CPU_INIT string default "cpu/intel/haswell/bootblock.c" -config SERIAL_CPU_INIT - bool - default n - config SMM_TSEG_SIZE hex default 0x800000 diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c index f30ea45da5..d67a5b829f 100644 --- a/src/cpu/intel/hyperthreading/intel_sibling.c +++ b/src/cpu/intel/hyperthreading/intel_sibling.c @@ -7,7 +7,7 @@ #include <smp/spinlock.h> #include <assert.h> -#if !CONFIG_SERIAL_CPU_INIT +#if CONFIG_PARALLEL_CPU_INIT #error Intel hyper-threading requires serialized cpu init #endif diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig index f59845e5d2..3ef314d711 100644 --- a/src/cpu/intel/model_2065x/Kconfig +++ b/src/cpu/intel/model_2065x/Kconfig @@ -15,6 +15,7 @@ config CPU_SPECIFIC_OPTIONS select TSC_CONSTANT_RATE select SMM_TSEG select SUPPORT_CPU_UCODE_IN_CBFS + select PARALLEL_CPU_INIT #select AP_IN_SIPI_WAIT select TSC_SYNC_MFENCE @@ -22,10 +23,6 @@ config BOOTBLOCK_CPU_INIT string default "cpu/intel/model_2065x/bootblock.c" -config SERIAL_CPU_INIT - bool - default n - config SMM_TSEG_SIZE hex default 0x800000 diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig index eb45bf8e44..a679e00139 100644 --- a/src/cpu/intel/model_206ax/Kconfig +++ b/src/cpu/intel/model_206ax/Kconfig @@ -16,6 +16,7 @@ config CPU_SPECIFIC_OPTIONS select UDELAY_LAPIC select SMM_TSEG select SUPPORT_CPU_UCODE_IN_CBFS + select PARALLEL_CPU_INIT #select AP_IN_SIPI_WAIT select TSC_SYNC_MFENCE @@ -23,10 +24,6 @@ config BOOTBLOCK_CPU_INIT string default "cpu/intel/model_206ax/bootblock.c" -config SERIAL_CPU_INIT - bool - default n - config SMM_TSEG_SIZE hex default 0x800000 |