summaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/Makefile3
-rw-r--r--arch/x86/lib/fsp1/Makefile (renamed from arch/x86/lib/fsp/Makefile)0
-rw-r--r--arch/x86/lib/fsp1/fsp_car.S (renamed from arch/x86/lib/fsp/fsp_car.S)0
-rw-r--r--arch/x86/lib/fsp1/fsp_common.c (renamed from arch/x86/lib/fsp/fsp_common.c)2
-rw-r--r--arch/x86/lib/fsp1/fsp_dram.c (renamed from arch/x86/lib/fsp/fsp_dram.c)2
-rw-r--r--arch/x86/lib/fsp1/fsp_graphics.c (renamed from arch/x86/lib/fsp/fsp_graphics.c)2
-rw-r--r--arch/x86/lib/fsp1/fsp_support.c (renamed from arch/x86/lib/fsp/fsp_support.c)2
7 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 906be5eab9..a8c7448ee4 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -43,7 +43,8 @@ ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_CMD_ZBOOT) += zimage.o
endif
obj-$(CONFIG_USE_HOB) += hob.o
-obj-$(CONFIG_HAVE_FSP) += fsp/
+obj-$(CONFIG_FSP_VERSION1) += fsp1/
+obj-$(CONFIG_FSP_VERSION2) += fsp2/
ifdef CONFIG_SPL_BUILD
ifdef CONFIG_TPL_BUILD
diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp1/Makefile
index 870de71bd7..870de71bd7 100644
--- a/arch/x86/lib/fsp/Makefile
+++ b/arch/x86/lib/fsp1/Makefile
diff --git a/arch/x86/lib/fsp/fsp_car.S b/arch/x86/lib/fsp1/fsp_car.S
index 8c54cea3db..8c54cea3db 100644
--- a/arch/x86/lib/fsp/fsp_car.S
+++ b/arch/x86/lib/fsp1/fsp_car.S
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
index ed0827c6e9..591eef7b81 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp1/fsp_common.c
@@ -14,7 +14,7 @@
#include <asm/mrccache.h>
#include <asm/post.h>
#include <asm/processor.h>
-#include <asm/fsp/fsp_support.h>
+#include <asm/fsp1/fsp_support.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index 3a23b70410..3bf65b495c 100644
--- a/arch/x86/lib/fsp/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -4,7 +4,7 @@
*/
#include <common.h>
-#include <asm/fsp/fsp_support.h>
+#include <asm/fsp1/fsp_support.h>
#include <asm/e820.h>
#include <asm/mrccache.h>
#include <asm/post.h>
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp1/fsp_graphics.c
index 91d2d08557..52e71334f9 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp1/fsp_graphics.c
@@ -7,7 +7,7 @@
#include <dm.h>
#include <vbe.h>
#include <video.h>
-#include <asm/fsp/fsp_support.h>
+#include <asm/fsp1/fsp_support.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index 0eaa9b232b..019a42f53f 100644
--- a/arch/x86/lib/fsp/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -5,7 +5,7 @@
*/
#include <common.h>
-#include <asm/fsp/fsp_support.h>
+#include <asm/fsp1/fsp_support.h>
#include <asm/post.h>
struct fsp_header *__attribute__((optimize("O0"))) find_fsp_header(void)