At present the x86 FSP (Firmware Support Package) code assumes that FSP version 1 is used. Since this code was added to U-Boot a new version (FSP2) has been produced by Intel.
In preparation for adding support for FSP2, move the existing code into a directory that indicates it is used for FSP1.
Changes in v3: - Drop struct efi_guid and add a comment about forward declarations
Changes in v2: - Correct Intel FSP web link - Rewrite to make azalia a common file for FSP1 and FSP2
Simon Glass (10): x86: Rename existing FSP code to fsp1 x86: Move fsp_azalia.h to the generic fsp directory x86: Create a new fsp_arch.h header x86: Move fsp_api.h inclusion out of fsp_support.h x86: Move fsp_types.h to the generic fsp directory x86: Move fsp_fv.h to the generic fsp directory x86: Move fsp_hob.h to the generic fsp directory x86: Move fsp_infoheader.h to the generic fsp directory x86: Move fsp_bootmode.h to the generic fsp directory x86: Move fsp_ffs.h include to fsp_arch.h
arch/x86/Kconfig | 25 ++++++++++++++++++- arch/x86/cpu/baytrail/acpi.c | 2 +- arch/x86/cpu/baytrail/fsp_configs.c | 2 +- arch/x86/cpu/braswell/fsp_configs.c | 2 +- arch/x86/cpu/ivybridge/fsp_configs.c | 2 +- arch/x86/cpu/queensbay/fsp_configs.c | 2 +- arch/x86/cpu/queensbay/tnc.c | 2 +- arch/x86/include/asm/{fsp => fsp1}/fsp_api.h | 0 arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h | 0 .../include/asm/{fsp => fsp1}/fsp_support.h | 19 +++++++------- arch/x86/include/asm/fsp_arch.h | 22 ++++++++++++++++ arch/x86/include/asm/u-boot-x86.h | 2 +- arch/x86/lib/Makefile | 3 ++- arch/x86/lib/{fsp => fsp1}/Makefile | 0 arch/x86/lib/{fsp => fsp1}/fsp_car.S | 0 arch/x86/lib/{fsp => fsp1}/fsp_common.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_dram.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_graphics.c | 2 +- arch/x86/lib/{fsp => fsp1}/fsp_support.c | 2 +- .../som-db5800-som-6867/som-db5800-som-6867.c | 2 +- board/intel/cherryhill/cherryhill.c | 2 +- cmd/x86/fsp.c | 2 +- drivers/pci/pci-uclass.c | 2 +- 23 files changed, 73 insertions(+), 26 deletions(-) rename arch/x86/include/asm/{fsp => fsp1}/fsp_api.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_ffs.h (100%) rename arch/x86/include/asm/{fsp => fsp1}/fsp_support.h (94%) create mode 100644 arch/x86/include/asm/fsp_arch.h rename arch/x86/lib/{fsp => fsp1}/Makefile (100%) rename arch/x86/lib/{fsp => fsp1}/fsp_car.S (100%) rename arch/x86/lib/{fsp => fsp1}/fsp_common.c (99%) rename arch/x86/lib/{fsp => fsp1}/fsp_dram.c (98%) rename arch/x86/lib/{fsp => fsp1}/fsp_graphics.c (98%) rename arch/x86/lib/{fsp => fsp1}/fsp_support.c (99%)