sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsp: Move fsp to fsp1_0

Browse Source 
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>
This commit is contained in:
Marc Jones
2015-04-22 23:16:31 -06:00
committed by Stefan Reinauer
parent be34797e4c
commit 786879777a
81 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/Makefile.inc
View File

@@ -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"

2
src/cpu/intel/fsp_model_206ax/Kconfig
View File

@@ -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

2
src/cpu/intel/fsp_model_406dx/Kconfig
View File

@@ -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

4
src/cpu/x86/Kconfig
View File

@@ -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

10
src/cpu/x86/car.c
View File

@@ -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();