diff options
| author | Marc Jones <marc.jones@se-eng.com> | 2015-04-22 23:16:31 -0600 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-04-24 00:37:37 +0200 |
| commit | 786879777a70cb82c94588e6d14c8fdd18ab4345 (patch) | |
| tree | a3dea1ee11739a00b63ffead17d7cd29078a70b8 /src/cpu | |
| parent | be34797e4c2a5b74bb8fcbbe9e4301b471d185e5 (diff) | |
fsp: Move fsp to fsp1_0
Prepare for FSP 1.1 integration by moving the FSP to a FSP 1.0 specific
directory. See follow-on patches for sharing of common code.
Change-Id: Ic58cb4074c65b91d119909132a012876d7ee7b74
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/9970
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/intel/fsp_model_206ax/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/intel/fsp_model_406dx/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/x86/Kconfig | 4 | ||||
| -rw-r--r-- | src/cpu/x86/car.c | 10 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index da0e76f52c..b0991bc501 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -30,7 +30,7 @@ cpu_ucode_cbfs_file = $(obj)/cpu_microcode_blob.bin cbfs_include_ucode = y endif -ifeq ($(CONFIG_PLATFORM_USES_FSP), y) +ifeq ($(CONFIG_PLATFORM_USES_FSP1_0), y) cpu_ucode_cbfs_offset = "-b $(CONFIG_CPU_MICROCODE_CBFS_LOC)" else cpu_ucode_cbfs_offset = "-b" diff --git a/src/cpu/intel/fsp_model_206ax/Kconfig b/src/cpu/intel/fsp_model_206ax/Kconfig index 05bdce4efe..71deb3aa8a 100644 --- a/src/cpu/intel/fsp_model_206ax/Kconfig +++ b/src/cpu/intel/fsp_model_206ax/Kconfig @@ -28,7 +28,7 @@ if CPU_INTEL_FSP_MODEL_206AX || CPU_INTEL_FSP_MODEL_306AX config CPU_SPECIFIC_OPTIONS def_bool y - select PLATFORM_USES_FSP + select PLATFORM_USES_FSP1_0 select ARCH_BOOTBLOCK_X86_32 select ARCH_VERSTAGE_X86_32 select ARCH_ROMSTAGE_X86_32 diff --git a/src/cpu/intel/fsp_model_406dx/Kconfig b/src/cpu/intel/fsp_model_406dx/Kconfig index ec4be847b0..7813969d12 100644 --- a/src/cpu/intel/fsp_model_406dx/Kconfig +++ b/src/cpu/intel/fsp_model_406dx/Kconfig @@ -24,7 +24,7 @@ if CPU_INTEL_FSP_MODEL_406DX config CPU_SPECIFIC_OPTIONS def_bool y - select PLATFORM_USES_FSP + select PLATFORM_USES_FSP1_0 select ARCH_BOOTBLOCK_X86_32 select ARCH_VERSTAGE_X86_32 select ARCH_ROMSTAGE_X86_32 diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 41c22886c5..21a0fac79c 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -105,12 +105,12 @@ config X86_AMD_FIXED_MTRRS This option informs the MTRR code to use the RdMem and WrMem fields in the fixed MTRR MSRs. -config PLATFORM_USES_FSP +config PLATFORM_USES_FSP1_0 bool default n help Selected for Intel processors/platform combinations that use the - Intel Firmware Support Package (FSP) for initialization. + Intel Firmware Support Package (FSP) 1.0 for initialization. config PARALLEL_MP def_bool n diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index 18d74b25c7..342a179bfc 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -23,8 +23,8 @@ #include <cbmem.h> #include <arch/early_variables.h> -#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP) -#include <drivers/intel/fsp/fsp_util.h> +#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_0) +#include <drivers/intel/fsp1_0/fsp_util.h> #endif typedef void (* const car_migration_func_t)(void); @@ -67,7 +67,7 @@ void *car_get_var_ptr(void *var) return var; } -#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP) +#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_0) migrated_base=(char *)find_saved_temp_mem( *(void **)CBMEM_FSP_HOB_PTR); #else @@ -100,7 +100,7 @@ void *car_sync_var_ptr(void *var) if (*mig_var < _car_start || *mig_var > _car_end) return mig_var; -#if !IS_ENABLED(CONFIG_PLATFORM_USES_FSP) +#if !IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_0) /* Keep console buffer in CAR until cbmemc_reinit() moves it. */ if (*mig_var == _car_end) return mig_var; @@ -149,7 +149,7 @@ static void do_car_migrate_hooks(void) void car_migrate_variables(void) { - if (!IS_ENABLED(PLATFORM_USES_FSP)) + if (!IS_ENABLED(PLATFORM_USES_FSP1_0)) do_car_migrate_variables(); do_car_migrate_hooks(); |