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

FSP platform microcode: Update to remove Kconfig variable

Browse Source 
Move the Kconfig variable into a .h file - this does not need to be
in Kconfig.

Change-Id: I1db20790ddb32e0eb082503c6c60cbbefa818bb9
Signed-off-by: Martin Roth <martin.roth@se-eng.com>
Reviewed-on: http://review.coreboot.org/7646
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
This commit is contained in:
Martin Roth
2014-12-04 18:06:36 -07:00
committed by Martin Roth
parent db3e2f0931
commit e10108a669
13 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,12 +58,6 @@ config CPU_MICROCODE_CBFS_LOC
depends on SUPPORT_CPU_UCODE_IN_CBFS
default 0xfff70000
config CPU_MICROCODE_CBFS_LEN
hex
depends on SUPPORT_CPU_UCODE_IN_CBFS
default 0xC000 if CPU_INTEL_FSP_MODEL_306AX
default 0x2800 if CPU_INTEL_FSP_MODEL_206AX
config MICROCODE_INCLUDE_PATH
string "Location of the intel microcode patches"
default "../intel/cpu/ivybridge/microcode" if CPU_INTEL_FSP_MODEL_306AX

1
src/cpu/intel/fsp_model_206ax/Makefile.inc
View File

@@ -6,6 +6,7 @@ ramstage-y += acpi.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c
CPPFLAGS_romstage += -I$(src)/cpu/intel/fsp_model_206ax
ifneq ($(CONFIG_MICROCODE_INCLUDE_PATH),)
ifneq ($(wildcard $(shell readlink -f "$(top)/$(CONFIG_MICROCODE_INCLUDE_PATH)")),)

4
src/cpu/intel/fsp_model_206ax/microcode_blob.h
View File

@@ -19,12 +19,12 @@
*/
#if IS_ENABLED(CONFIG_CPU_INTEL_FSP_MODEL_206AX)
/* Size is 0x2800 - Update in Kconfigs when any included file changes*/
/* Size is 0x2800 - Update in microcode_size.h when any included file changes*/
#include <microcode-m12206a7_00000029.h>
#endif
#if IS_ENABLED(CONFIG_CPU_INTEL_FSP_MODEL_306AX)
/* Size is 0xC000 - Update in Kconfigs when any included file changes*/
/* Size is 0xC000 - Update in microcode_size.h when any included file changes*/
#include <microcode-m12306a2_00000008.h>
#include <microcode-m12306a4_00000007.h>
#include <microcode-m12306a5_00000007.h>

7
src/cpu/intel/fsp_model_206ax/microcode_size.h Normal file
View File

@@ -0,0 +1,7 @@
/* Maximum size of the area that the FSP will search for the correct microcode */
#if IS_ENABLED(CONFIG_CPU_INTEL_FSP_MODEL_306AX)
#define MICROCODE_REGION_LENGTH 0xC000
#elif IS_ENABLED(CONFIG_CPU_INTEL_FSP_MODEL_206AX)
#define MICROCODE_REGION_LENGTH 0x2800
#endif

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

@@ -62,12 +62,6 @@ config CPU_MICROCODE_CBFS_LOC
depends on SUPPORT_CPU_UCODE_IN_CBFS
default 0xfff60040
config CPU_MICROCODE_CBFS_LEN
hex
depends on SUPPORT_CPU_UCODE_IN_CBFS
default 0x14400 if FSP_MODEL_406DX_A1
default 0x14800 if FSP_MODEL_406DX_B0
config MICROCODE_INCLUDE_PATH
string "Location of the intel microcode patches"
default "../intel/cpu/rangeley/microcode"

1
src/cpu/intel/fsp_model_406dx/Makefile.inc
View File

@@ -23,6 +23,7 @@ subdirs-y += ../../x86/name
ramstage-y += acpi.c
cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c
CPPFLAGS_romstage += -I$(src)/cpu/intel/fsp_model_406dx
ifneq ($(CONFIG_MICROCODE_INCLUDE_PATH),)
ifneq ($(wildcard $(shell readlink -f "$(top)/$(CONFIG_MICROCODE_INCLUDE_PATH)")),)

4
src/cpu/intel/fsp_model_406dx/microcode_blob.c
View File

@@ -20,10 +20,10 @@
unsigned microcode[] = {
#if IS_ENABLED(CONFIG_FSP_MODEL_406DX_A1)
/* Size is 0x14400 */
/* Size is 0x14400 - update in microcode_size.h when the file changes */
#include <microcode-m01406d000e.h>
#elif IS_ENABLED(CONFIG_FSP_MODEL_406DX_B0)
/* Size is 0x14800 */
/* Size is 0x14800 - update in microcode_size.h when the file changes */
#include <microcode-m01406d811d.h>
#endif
};

7
src/cpu/intel/fsp_model_406dx/microcode_size.h Normal file
View File

@@ -0,0 +1,7 @@
/* Maximum size of the area that the FSP will search for the correct microcode */
#if IS_ENABLED(CONFIG_FSP_MODEL_406DX_A1)
#define MICROCODE_REGION_LENGTH 0x14400
#elif IS_ENABLED(CONFIG_FSP_MODEL_406DX_B0)
#define MICROCODE_REGION_LENGTH 0x14800
#endif