From 21a1133d823b3cadbbe9f18475948bfcd587be60 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 2 Oct 2019 08:26:41 +0800
Subject: [PATCH] x86: Move fsp_infoheader.h to the generic fsp directory

This header file is the same for FSP v1 and v2. Move it into the general
fsp directory.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: move rename of fsp_infoheader.h from previous patch to this one]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---
 arch/x86/include/asm/{fsp1 => fsp}/fsp_infoheader.h | 0
 arch/x86/include/asm/fsp1/fsp_support.h             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/x86/include/asm/{fsp1 => fsp}/fsp_infoheader.h (100%)

diff --git a/arch/x86/include/asm/fsp1/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h
similarity index 100%
rename from arch/x86/include/asm/fsp1/fsp_infoheader.h
rename to arch/x86/include/asm/fsp/fsp_infoheader.h
diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
index e204045482..ed4335ed29 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -9,9 +9,9 @@
 
 #include <asm/fsp/fsp_fv.h>
 #include <asm/fsp/fsp_hob.h>
+#include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp/fsp_types.h>
 #include "fsp_ffs.h"
-#include "fsp_infoheader.h"
 #include "fsp_bootmode.h"
 #include <asm/fsp_arch.h>
 #include <asm/fsp/fsp_azalia.h>
-- 
2.25.1