x86: Rename existing FSP code to fsp1

Since there is now a new version of the FSP and it is incompatible with
the existing version, move the code into an fsp1 directory. This will
allow us to put FSP v2 code into an fsp2 directory.

Add a Kconfig which defines which version is in use.

Some of the code in this new fsp1/ directory is generic across both FSPv1
and FSPv2. Future patches will address this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>

9 files changed, 0 insertions, 803 deletions

diff --git a/arch/x86/include/asm/fsp/fsp_api.h b/arch/x86/include/asm/fsp/fsp_api.h
deleted file mode 100644
index f2d70799f3..0000000000
--- a/arch/x86/include/asm/fsp/fsp_api.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_API_H__
-#define __FSP_API_H__
-
-#include <linux/linkage.h>
-
-/*
- * FSP common configuration structure.
- * This needs to be included in the platform-specific struct fsp_config_data.
- */
-struct fsp_cfg_common {
-	struct fsp_header	*fsp_hdr;
-	u32			stack_top;
-	u32			boot_mode;
-};
-
-/*
- * FspInit continuation function prototype.
- * Control will be returned to this callback function after FspInit API call.
- */
-typedef void (*fsp_continuation_f)(u32 status, void *hob_list);
-
-struct fsp_init_params {
-	/* Non-volatile storage buffer pointer */
-	void			*nvs_buf;
-	/* Runtime buffer pointer */
-	void			*rt_buf;
-	/* Continuation function address */
-	fsp_continuation_f	continuation;
-};
-
-struct common_buf {
-	/*
-	 * Stack top pointer used by the bootloader. The new stack frame will be
-	 * set up at this location after FspInit API call.
-	 */
-	u32	stack_top;
-	u32	boot_mode;	/* Current system boot mode */
-	void	*upd_data;	/* User platform configuraiton data region */
-	u32	tolum_size;	/* Top of low usable memory size (FSP 1.1) */
-	u32	reserved[6];	/* Reserved */
-};
-
-enum fsp_phase {
-	/* Notification code for post PCI enuermation */
-	INIT_PHASE_PCI	= 0x20,
-	/* Notification code before transfering control to the payload */
-	INIT_PHASE_BOOT	= 0x40
-};
-
-struct fsp_notify_params {
-	/* Notification phase used for NotifyPhase API */
-	enum fsp_phase	phase;
-};
-
-/* FspInit API function prototype */
-typedef asmlinkage u32 (*fsp_init_f)(struct fsp_init_params *params);
-
-/* FspNotify API function prototype */
-typedef asmlinkage u32 (*fsp_notify_f)(struct fsp_notify_params *params);
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h
deleted file mode 100644
index e59180bdae..0000000000
--- a/arch/x86/include/asm/fsp/fsp_azalia.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2015, Google, Inc
- */
-
-#ifndef _FSP_AZALIA_H_
-#define _FSP_AZALIA_H_
-
-struct __packed azalia_verb_table_header {
-	u32 vendor_device_id;
-	u16 sub_system_id;
-	u8 revision_id;		/* 0xff applies to all steppings */
-	u8 front_panel_support;
-	u16 number_of_rear_jacks;
-	u16 number_of_front_jacks;
-};
-
-struct __packed azalia_verb_table {
-	struct azalia_verb_table_header header;
-	const u32 *data;
-};
-
-struct __packed azalia_config {
-	u8 pme_enable:1;
-	u8 docking_supported:1;
-	u8 docking_attached:1;
-	u8 hdmi_codec_enable:1;
-	u8 azalia_v_ci_enable:1;
-	u8 rsvdbits:3;
-	/* number of verb tables provided by platform */
-	u8 verb_table_num;
-	const struct azalia_verb_table *verb_table;
-	/* delay timer after azalia reset */
-	u16 reset_wait_timer_ms;
-};
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_bootmode.h b/arch/x86/include/asm/fsp/fsp_bootmode.h
deleted file mode 100644
index bc96ec308c..0000000000
--- a/arch/x86/include/asm/fsp/fsp_bootmode.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_BOOT_MODE_H__
-#define __FSP_BOOT_MODE_H__
-
-/* 0x21 - 0xf..f are reserved */
-#define BOOT_FULL_CONFIG		0x00
-#define BOOT_MINIMAL_CONFIG		0x01
-#define BOOT_NO_CONFIG_CHANGES		0x02
-#define BOOT_FULL_CONFIG_PLUS_DIAG	0x03
-#define BOOT_DEFAULT_SETTINGS		0x04
-#define BOOT_ON_S4_RESUME		0x05
-#define BOOT_ON_S5_RESUME		0x06
-#define BOOT_ON_S2_RESUME		0x10
-#define BOOT_ON_S3_RESUME		0x11
-#define BOOT_ON_FLASH_UPDATE		0x12
-#define BOOT_IN_RECOVERY_MODE		0x20
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_ffs.h b/arch/x86/include/asm/fsp/fsp_ffs.h
deleted file mode 100644
index b7558e5a17..0000000000
--- a/arch/x86/include/asm/fsp/fsp_ffs.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_FFS_H__
-#define __FSP_FFS_H__
-
-/* Used to verify the integrity of the file */
-union __packed ffs_integrity {
-	struct {
-		/*
-		 * The IntegrityCheck.checksum.header field is an 8-bit
-		 * checksum of the file header. The State and
-		 * IntegrityCheck.checksum.file fields are assumed to be zero
-		 * and the checksum is calculated such that the entire header
-		 * sums to zero.
-		 */
-		u8	header;
-		/*
-		 * If the FFS_ATTRIB_CHECKSUM (see definition below) bit of
-		 * the Attributes field is set to one, the
-		 * IntegrityCheck.checksum.file field is an 8-bit checksum of
-		 * the file data. If the FFS_ATTRIB_CHECKSUM bit of the
-		 * Attributes field is cleared to zero, the
-		 * IntegrityCheck.checksum.file field must be initialized with
-		 * a value of 0xAA. The IntegrityCheck.checksum.file field is
-		 * valid any time the EFI_FILE_DATA_VALID bit is set in the
-		 * State field.
-		 */
-		u8	file;
-	} checksum;
-
-	/* This is the full 16 bits of the IntegrityCheck field */
-	u16	checksum16;
-};
-
-/*
- * Each file begins with the header that describe the
- * contents and state of the files.
- */
-struct __packed ffs_file_header {
-	/*
-	 * This GUID is the file name.
-	 * It is used to uniquely identify the file.
-	 */
-	efi_guid_t		name;
-	/* Used to verify the integrity of the file */
-	union ffs_integrity	integrity;
-	/* Identifies the type of file */
-	u8			type;
-	/* Declares various file attribute bits */
-	u8			attr;
-	/* The length of the file in bytes, including the FFS header */
-	u8			size[3];
-	/*
-	 * Used to track the state of the file throughout the life of
-	 * the file from creation to deletion.
-	 */
-	u8			state;
-};
-
-struct __packed ffs_file_header2 {
-	/*
-	 * This GUID is the file name. It is used to uniquely identify the file.
-	 * There may be only one instance of a file with the file name GUID of
-	 * Name in any given firmware volume, except if the file type is
-	 * EFI_FV_FILE_TYPE_FFS_PAD.
-	 */
-	efi_guid_t		name;
-	/* Used to verify the integrity of the file */
-	union ffs_integrity	integrity;
-	/* Identifies the type of file */
-	u8			type;
-	/* Declares various file attribute bits */
-	u8			attr;
-	/*
-	 * The length of the file in bytes, including the FFS header.
-	 * The length of the file data is either
-	 * (size - sizeof(struct ffs_file_header)). This calculation means a
-	 * zero-length file has a size of 24 bytes, which is
-	 * sizeof(struct ffs_file_header). Size is not required to be a
-	 * multiple of 8 bytes. Given a file F, the next file header is located
-	 * at the next 8-byte aligned firmware volume offset following the last
-	 * byte of the file F.
-	 */
-	u8			size[3];
-	/*
-	 * Used to track the state of the file throughout the life of
-	 * the file from creation to deletion.
-	 */
-	u8			state;
-	/*
-	 * If FFS_ATTRIB_LARGE_FILE is set in attr, then ext_size exists
-	 * and size must be set to zero.
-	 * If FFS_ATTRIB_LARGE_FILE is not set then
-	 * struct ffs_file_header is used.
-	 */
-	u32			ext_size;
-};
-
-/*
- * Pseudo type. It is used as a wild card when retrieving sections.
- * The section type EFI_SECTION_ALL matches all section types.
- */
-#define EFI_SECTION_ALL				0x00
-
-/* Encapsulation section Type values */
-#define EFI_SECTION_COMPRESSION			0x01
-#define EFI_SECTION_GUID_DEFINED		0x02
-#define EFI_SECTION_DISPOSABLE			0x03
-
-/* Leaf section Type values */
-#define EFI_SECTION_PE32			0x10
-#define EFI_SECTION_PIC				0x11
-#define EFI_SECTION_TE				0x12
-#define EFI_SECTION_DXE_DEPEX			0x13
-#define EFI_SECTION_VERSION			0x14
-#define EFI_SECTION_USER_INTERFACE		0x15
-#define EFI_SECTION_COMPATIBILITY16		0x16
-#define EFI_SECTION_FIRMWARE_VOLUME_IMAGE	0x17
-#define EFI_SECTION_FREEFORM_SUBTYPE_GUID	0x18
-#define EFI_SECTION_RAW				0x19
-#define EFI_SECTION_PEI_DEPEX			0x1B
-#define EFI_SECTION_SMM_DEPEX			0x1C
-
-/* Common section header */
-struct __packed raw_section {
-	/*
-	 * A 24-bit unsigned integer that contains the total size of
-	 * the section in bytes, including the EFI_COMMON_SECTION_HEADER.
-	 */
-	u8	size[3];
-	u8	type;
-};
-
-struct __packed raw_section2 {
-	/*
-	 * A 24-bit unsigned integer that contains the total size of
-	 * the section in bytes, including the EFI_COMMON_SECTION_HEADER.
-	 */
-	u8	size[3];
-	u8	type;
-	/*
-	 * If size is 0xFFFFFF, then ext_size contains the size of
-	 * the section. If size is not equal to 0xFFFFFF, then this
-	 * field does not exist.
-	 */
-	u32	ext_size;
-};
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_fv.h b/arch/x86/include/asm/fsp/fsp_fv.h
deleted file mode 100644
index 511dfb78b8..0000000000
--- a/arch/x86/include/asm/fsp/fsp_fv.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_FV___
-#define __FSP_FV___
-
-/* Value of EFI_FV_FILE_ATTRIBUTES */
-#define EFI_FV_FILE_ATTR_ALIGNMENT	0x0000001F
-#define EFI_FV_FILE_ATTR_FIXED		0x00000100
-#define EFI_FV_FILE_ATTR_MEMORY_MAPPED	0x00000200
-
-/* Attributes bit definitions */
-#define EFI_FVB2_READ_DISABLED_CAP	0x00000001
-#define EFI_FVB2_READ_ENABLED_CAP	0x00000002
-#define EFI_FVB2_READ_STATUS		0x00000004
-#define EFI_FVB2_WRITE_DISABLED_CAP	0x00000008
-#define EFI_FVB2_WRITE_ENABLED_CAP	0x00000010
-#define EFI_FVB2_WRITE_STATUS		0x00000020
-#define EFI_FVB2_LOCK_CAP		0x00000040
-#define EFI_FVB2_LOCK_STATUS		0x00000080
-#define EFI_FVB2_STICKY_WRITE		0x00000200
-#define EFI_FVB2_MEMORY_MAPPED		0x00000400
-#define EFI_FVB2_ERASE_POLARITY		0x00000800
-#define EFI_FVB2_READ_LOCK_CAP		0x00001000
-#define EFI_FVB2_READ_LOCK_STATUS	0x00002000
-#define EFI_FVB2_WRITE_LOCK_CAP		0x00004000
-#define EFI_FVB2_WRITE_LOCK_STATUS	0x00008000
-#define EFI_FVB2_ALIGNMENT		0x001F0000
-#define EFI_FVB2_ALIGNMENT_1		0x00000000
-#define EFI_FVB2_ALIGNMENT_2		0x00010000
-#define EFI_FVB2_ALIGNMENT_4		0x00020000
-#define EFI_FVB2_ALIGNMENT_8		0x00030000
-#define EFI_FVB2_ALIGNMENT_16		0x00040000
-#define EFI_FVB2_ALIGNMENT_32		0x00050000
-#define EFI_FVB2_ALIGNMENT_64		0x00060000
-#define EFI_FVB2_ALIGNMENT_128		0x00070000
-#define EFI_FVB2_ALIGNMENT_256		0x00080000
-#define EFI_FVB2_ALIGNMENT_512		0x00090000
-#define EFI_FVB2_ALIGNMENT_1K		0x000A0000
-#define EFI_FVB2_ALIGNMENT_2K		0x000B0000
-#define EFI_FVB2_ALIGNMENT_4K		0x000C0000
-#define EFI_FVB2_ALIGNMENT_8K		0x000D0000
-#define EFI_FVB2_ALIGNMENT_16K		0x000E0000
-#define EFI_FVB2_ALIGNMENT_32K		0x000F0000
-#define EFI_FVB2_ALIGNMENT_64K		0x00100000
-#define EFI_FVB2_ALIGNMENT_128K		0x00110000
-#define EFI_FVB2_ALIGNMENT_256K		0x00120000
-#define EFI_FVB2_ALIGNMENT_512K		0x00130000
-#define EFI_FVB2_ALIGNMENT_1M		0x00140000
-#define EFI_FVB2_ALIGNMENT_2M		0x00150000
-#define EFI_FVB2_ALIGNMENT_4M		0x00160000
-#define EFI_FVB2_ALIGNMENT_8M		0x00170000
-#define EFI_FVB2_ALIGNMENT_16M		0x00180000
-#define EFI_FVB2_ALIGNMENT_32M		0x00190000
-#define EFI_FVB2_ALIGNMENT_64M		0x001A0000
-#define EFI_FVB2_ALIGNMENT_128M		0x001B0000
-#define EFI_FVB2_ALIGNMENT_256M		0x001C0000
-#define EFI_FVB2_ALIGNMENT_512M		0x001D0000
-#define EFI_FVB2_ALIGNMENT_1G		0x001E0000
-#define EFI_FVB2_ALIGNMENT_2G		0x001F0000
-
-struct fv_blkmap_entry {
-	/* The number of sequential blocks which are of the same size */
-	u32	num_blocks;
-	/* The size of the blocks */
-	u32	length;
-};
-
-/* Describes the features and layout of the firmware volume */
-struct fv_header {
-	/*
-	 * The first 16 bytes are reserved to allow for the reset vector of
-	 * processors whose reset vector is at address 0.
-	 */
-	u8			zero_vec[16];
-	/*
-	 * Declares the file system with which the firmware volume
-	 * is formatted.
-	 */
-	efi_guid_t		fs_guid;
-	/*
-	 * Length in bytes of the complete firmware volume, including
-	 * the header.
-	 */
-	u64			fv_len;
-	/* Set to EFI_FVH_SIGNATURE */
-	u32			sign;
-	/*
-	 * Declares capabilities and power-on defaults for the firmware
-	 * volume.
-	 */
-	u32			attr;
-	/* Length in bytes of the complete firmware volume header */
-	u16			hdr_len;
-	/*
-	 * A 16-bit checksum of the firmware volume header.
-	 * A valid header sums to zero.
-	 */
-	u16			checksum;
-	/*
-	 * Offset, relative to the start of the header, of the extended
-	 * header (EFI_FIRMWARE_VOLUME_EXT_HEADER) or zero if there is
-	 * no extended header.
-	 */
-	u16			ext_hdr_off;
-	/* This field must always be set to zero */
-	u8			reserved[1];
-	/*
-	 * Set to 2. Future versions of this specification may define new
-	 * header fields and will increment the Revision field accordingly.
-	 */
-	u8			rev;
-	/*
-	 * An array of run-length encoded FvBlockMapEntry structures.
-	 * The array is terminated with an entry of {0,0}.
-	 */
-	struct fv_blkmap_entry	block_map[1];
-};
-
-#define EFI_FVH_SIGNATURE	SIGNATURE_32('_', 'F', 'V', 'H')
-
-/* Firmware Volume Header Revision definition */
-#define EFI_FVH_REVISION	0x02
-
-/* Extension header pointed by ExtHeaderOffset of volume header */
-struct fv_ext_header {
-	/* firmware volume name */
-	efi_guid_t		fv_name;
-	/* Size of the rest of the extension header including this structure */
-	u32			ext_hdr_size;
-};
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_hob.h b/arch/x86/include/asm/fsp/fsp_hob.h
deleted file mode 100644
index 3bb79c4b67..0000000000
--- a/arch/x86/include/asm/fsp/fsp_hob.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_HOB_H__
-#define __FSP_HOB_H__
-
-#include <asm/hob.h>
-
-enum pixel_format {
-	pixel_rgbx_8bpc,	/* RGB 8 bit per color */
-	pixel_bgrx_8bpc,	/* BGR 8 bit per color */
-	pixel_bitmask,
-};
-
-struct __packed hob_graphics_info {
-	phys_addr_t fb_base;	/* framebuffer base address */
-	u32 fb_size;		/* framebuffer size */
-	u32 version;
-	u32 width;
-	u32 height;
-	enum pixel_format pixel_format;
-	u32 red_mask;
-	u32 green_mask;
-	u32 blue_mask;
-	u32 reserved_mask;
-	u32 pixels_per_scanline;
-};
-
-/* FSP specific GUID HOB definitions */
-#define FSP_GUID_DATA1		0x912740be
-#define FSP_GUID_DATA2		0x2284
-#define FSP_GUID_DATA3		0x4734
-#define FSP_GUID_DATA4_0	0xb9
-#define FSP_GUID_DATA4_1	0x71
-#define FSP_GUID_DATA4_2	0x84
-#define FSP_GUID_DATA4_3	0xb0
-#define FSP_GUID_DATA4_4	0x27
-#define FSP_GUID_DATA4_5	0x35
-#define FSP_GUID_DATA4_6	0x3f
-#define FSP_GUID_DATA4_7	0x0c
-
-#define FSP_GUID_BYTE0		0xbe
-#define FSP_GUID_BYTE1		0x40
-#define FSP_GUID_BYTE2		0x27
-#define FSP_GUID_BYTE3		0x91
-#define FSP_GUID_BYTE4		0x84
-#define FSP_GUID_BYTE5		0x22
-#define FSP_GUID_BYTE6		0x34
-#define FSP_GUID_BYTE7		0x47
-#define FSP_GUID_BYTE8		FSP_GUID_DATA4_0
-#define FSP_GUID_BYTE9		FSP_GUID_DATA4_1
-#define FSP_GUID_BYTE10		FSP_GUID_DATA4_2
-#define FSP_GUID_BYTE11		FSP_GUID_DATA4_3
-#define FSP_GUID_BYTE12		FSP_GUID_DATA4_4
-#define FSP_GUID_BYTE13		FSP_GUID_DATA4_5
-#define FSP_GUID_BYTE14		FSP_GUID_DATA4_6
-#define FSP_GUID_BYTE15		FSP_GUID_DATA4_7
-
-#define FSP_HEADER_GUID \
-	EFI_GUID(FSP_GUID_DATA1, FSP_GUID_DATA2, FSP_GUID_DATA3, \
-		FSP_GUID_DATA4_0, FSP_GUID_DATA4_1, FSP_GUID_DATA4_2, \
-		FSP_GUID_DATA4_3, FSP_GUID_DATA4_4, FSP_GUID_DATA4_5, \
-		FSP_GUID_DATA4_6, FSP_GUID_DATA4_7)
-
-#define FSP_NON_VOLATILE_STORAGE_HOB_GUID \
-	EFI_GUID(0x721acf02, 0x4d77, 0x4c2a, \
-		0xb3, 0xdc, 0x27, 0x0b, 0x7b, 0xa9, 0xe4, 0xb0)
-
-#define FSP_BOOTLOADER_TEMP_MEM_HOB_GUID \
-	EFI_GUID(0xbbcff46c, 0xc8d3, 0x4113, \
-		0x89, 0x85, 0xb9, 0xd4, 0xf3, 0xb3, 0xf6, 0x4e)
-
-#define FSP_HOB_RESOURCE_OWNER_FSP_GUID \
-	EFI_GUID(0x69a79759, 0x1373, 0x4367, \
-		0xa6, 0xc4, 0xc7, 0xf5, 0x9e, 0xfd, 0x98, 0x6e)
-
-#define FSP_HOB_RESOURCE_OWNER_TSEG_GUID \
-	EFI_GUID(0xd038747c, 0xd00c, 0x4980, \
-		0xb3, 0x19, 0x49, 0x01, 0x99, 0xa4, 0x7d, 0x55)
-
-#define FSP_HOB_RESOURCE_OWNER_GRAPHICS_GUID \
-	EFI_GUID(0x9c7c3aa7, 0x5332, 0x4917, \
-		0x82, 0xb9, 0x56, 0xa5, 0xf3, 0xe6, 0x2a, 0x07)
-
-/* The following GUIDs are newly introduced in FSP spec 1.1 */
-
-#define FSP_HOB_RESOURCE_OWNER_BOOTLOADER_TOLUM_GUID \
-	EFI_GUID(0x73ff4f56, 0xaa8e, 0x4451, \
-		0xb3, 0x16, 0x36, 0x35, 0x36, 0x67, 0xad, 0x44)
-
-#define FSP_GRAPHICS_INFO_HOB_GUID \
-	EFI_GUID(0x39f62cce, 0x6825, 0x4669, \
-		0xbb, 0x56, 0x54, 0x1a, 0xba, 0x75, 0x3a, 0x07)
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h
deleted file mode 100644
index 86f78014b7..0000000000
--- a/arch/x86/include/asm/fsp/fsp_infoheader.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef _FSP_HEADER_H_
-#define _FSP_HEADER_H_
-
-#define FSP_HEADER_OFF	0x94	/* Fixed FSP header offset in the FSP image */
-
-struct __packed fsp_header {
-	u32	sign;			/* 'FSPH' */
-	u32	hdr_len;		/* header length */
-	u8	reserved1[3];
-	u8	hdr_rev;		/* header rev */
-	u32	img_rev;		/* image rev */
-	char	img_id[8];		/* signature string */
-	u32	img_size;		/* image size */
-	u32	img_base;		/* image base */
-	u32	img_attr;		/* image attribute */
-	u32	cfg_region_off;		/* configuration region offset */
-	u32	cfg_region_size;	/* configuration region size */
-	u32	api_num;		/* number of API entries */
-	u32	fsp_tempram_init;	/* tempram_init offset */
-	u32	fsp_init;		/* fsp_init offset */
-	u32	fsp_notify;		/* fsp_notify offset */
-	u32	fsp_mem_init;		/* fsp_mem_init offset */
-	u32	fsp_tempram_exit;	/* fsp_tempram_exit offset */
-	u32	fsp_silicon_init;	/* fsp_silicon_init offset */
-};
-
-#define FSP_HEADER_REVISION_1		1
-#define FSP_HEADER_REVISION_2		2
-
-#define FSP_ATTR_GRAPHICS_SUPPORT	(1 << 0)
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h
deleted file mode 100644
index 7b92392a27..0000000000
--- a/arch/x86/include/asm/fsp/fsp_support.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_SUPPORT_H__
-#define __FSP_SUPPORT_H__
-
-#include "fsp_types.h"
-#include "fsp_hob.h"
-#include "fsp_fv.h"
-#include "fsp_ffs.h"
-#include "fsp_api.h"
-#include "fsp_infoheader.h"
-#include "fsp_bootmode.h"
-#include "fsp_azalia.h"
-#include <asm/arch/fsp/fsp_vpd.h>
-#include <asm/arch/fsp/fsp_configs.h>
-
-#define FSP_LOWMEM_BASE		0x100000UL
-#define FSP_HIGHMEM_BASE	0x100000000ULL
-#define UPD_TERMINATOR		0x55AA
-
-
-/**
- * FSP Continuation assembly helper routine
- *
- * This routine jumps to the C version of FSP continuation function
- */
-void asm_continuation(void);
-
-/**
- * FSP initialization complete
- *
- * This is the function that indicates FSP initialization is complete and jumps
- * back to the bootloader with HOB list pointer as the parameter.
- *
- * @hob_list:    HOB list pointer
- */
-void fsp_init_done(void *hob_list);
-
-/**
- * FSP Continuation function
- *
- * @status:      Always 0
- * @hob_list:    HOB list pointer
- *
- * @retval:      Never returns
- */
-void fsp_continue(u32 status, void *hob_list);
-
-/**
- * Find FSP header offset in FSP image
- *
- * @retval: the offset of FSP header. If signature is invalid, returns 0.
- */
-struct fsp_header *find_fsp_header(void);
-
-/**
- * FSP initialization wrapper function.
- *
- * @stack_top: bootloader stack top address
- * @boot_mode: boot mode defined in fsp_bootmode.h
- * @nvs_buf:   Non-volatile memory buffer pointer
- */
-void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf);
-
-/**
- * FSP notification wrapper function
- *
- * @fsp_hdr: Pointer to FSP information header
- * @phase:   FSP initialization phase defined in enum fsp_phase
- *
- * @retval:  compatible status code with EFI_STATUS defined in PI spec
- */
-u32 fsp_notify(struct fsp_header *fsp_hdr, u32 phase);
-
-/**
- * This function retrieves the top of usable low memory.
- *
- * @hob_list: A HOB list pointer.
- *
- * @retval:   Usable low memory top.
- */
-u32 fsp_get_usable_lowmem_top(const void *hob_list);
-
-/**
- * This function retrieves the top of usable high memory.
- *
- * @hob_list: A HOB list pointer.
- *
- * @retval:   Usable high memory top.
- */
-u64 fsp_get_usable_highmem_top(const void *hob_list);
-
-/**
- * This function retrieves a special reserved memory region.
- *
- * @hob_list: A HOB list pointer.
- * @len:      A pointer to the GUID HOB data buffer length.
- *            If the GUID HOB is located, the length will be updated.
- * @guid:     A pointer to the owner guild.
- *
- * @retval:   Reserved region start address.
- *            0 if this region does not exist.
- */
-u64 fsp_get_reserved_mem_from_guid(const void *hob_list,
-				   u64 *len, const efi_guid_t *guid);
-
-/**
- * This function retrieves the FSP reserved normal memory.
- *
- * @hob_list: A HOB list pointer.
- * @len:      A pointer to the FSP reserved memory length buffer.
- *            If the GUID HOB is located, the length will be updated.
- * @retval:   FSP reserved memory base
- *            0 if this region does not exist.
- */
-u32 fsp_get_fsp_reserved_mem(const void *hob_list, u32 *len);
-
-/**
- * This function retrieves the TSEG reserved normal memory.
- *
- * @hob_list:      A HOB list pointer.
- * @len:           A pointer to the TSEG reserved memory length buffer.
- *                 If the GUID HOB is located, the length will be updated.
- *
- * @retval NULL:   Failed to find the TSEG reserved memory.
- * @retval others: TSEG reserved memory base.
- */
-u32 fsp_get_tseg_reserved_mem(const void *hob_list, u32 *len);
-
-/**
- * This function retrieves FSP Non-volatile Storage HOB buffer and size.
- *
- * @hob_list:      A HOB list pointer.
- * @len:           A pointer to the NVS data buffer length.
- *                 If the HOB is located, the length will be updated.
- *
- * @retval NULL:   Failed to find the NVS HOB.
- * @retval others: FSP NVS data buffer pointer.
- */
-void *fsp_get_nvs_data(const void *hob_list, u32 *len);
-
-/**
- * This function retrieves Bootloader temporary stack buffer and size.
- *
- * @hob_list:      A HOB list pointer.
- * @len:           A pointer to the bootloader temporary stack length.
- *                 If the HOB is located, the length will be updated.
- *
- * @retval NULL:   Failed to find the bootloader temporary stack HOB.
- * @retval others: Bootloader temporary stackbuffer pointer.
- */
-void *fsp_get_bootloader_tmp_mem(const void *hob_list, u32 *len);
-
-/**
- * This function retrieves graphics information.
- *
- * @hob_list:      A HOB list pointer.
- * @len:           A pointer to the graphics info HOB length.
- *                 If the HOB is located, the length will be updated.
- *
- * @retval NULL:   Failed to find the graphics info HOB.
- * @retval others: A pointer to struct hob_graphics_info.
- */
-void *fsp_get_graphics_info(const void *hob_list, u32 *len);
-
-/**
- * This function overrides the default configurations of FSP.
- *
- * @config:  A pointer to the FSP configuration data structure
- * @rt_buf:  A pointer to the FSP runtime buffer data structure
- *
- * @return:  None
- */
-void update_fsp_configs(struct fsp_config_data *config,
-			struct fspinit_rtbuf *rt_buf);
-
-/**
- * fsp_init_phase_pci() - Tell the FSP that we have completed PCI init
- *
- * @return 0 if OK, -EPERM if the FSP gave an error.
- */
-int fsp_init_phase_pci(void);
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_types.h b/arch/x86/include/asm/fsp/fsp_types.h
deleted file mode 100644
index 3d5b17ecf1..0000000000
--- a/arch/x86/include/asm/fsp/fsp_types.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_TYPES_H__
-#define __FSP_TYPES_H__
-
-/**
- * Returns a 16-bit signature built from 2 ASCII characters.
- *
- * This macro returns a 16-bit value built from the two ASCII characters
- * specified by A and B.
- *
- * @A: The first ASCII character.
- * @B: The second ASCII character.
- *
- * @return: A 16-bit value built from the two ASCII characters specified by
- *          A and B.
- */
-#define SIGNATURE_16(A, B)	((A) | (B << 8))
-
-/**
- * Returns a 32-bit signature built from 4 ASCII characters.
- *
- * This macro returns a 32-bit value built from the four ASCII characters
- * specified by A, B, C, and D.
- *
- * @A: The first ASCII character.
- * @B: The second ASCII character.
- * @C: The third ASCII character.
- * @D: The fourth ASCII character.
- *
- * @return: A 32-bit value built from the two ASCII characters specified by
- *          A, B, C and D.
- */
-#define SIGNATURE_32(A, B, C, D)	\
-	(SIGNATURE_16(A, B) | (SIGNATURE_16(C, D) << 16))
-
-/**
- * Returns a 64-bit signature built from 8 ASCII characters.
- *
- * This macro returns a 64-bit value built from the eight ASCII characters
- * specified by A, B, C, D, E, F, G,and H.
- *
- * @A: The first ASCII character.
- * @B: The second ASCII character.
- * @C: The third ASCII character.
- * @D: The fourth ASCII character.
- * @E: The fifth ASCII character.
- * @F: The sixth ASCII character.
- * @G: The seventh ASCII character.
- * @H: The eighth ASCII character.
- *
- * @return: A 64-bit value built from the two ASCII characters specified by
- *          A, B, C, D, E, F, G and H.
- */
-#define SIGNATURE_64(A, B, C, D, E, F, G, H)	\
-	(SIGNATURE_32(A, B, C, D) | ((u64)(SIGNATURE_32(E, F, G, H)) << 32))
-
-#endif