From: Simon Glass <sjg@chromium.org>
Date: Wed, 25 Sep 2019 14:00:14 +0000 (-0600)
Subject: x86: Move fsp_api.h inclusion out of fsp_support.h
X-Git-Tag: v2020.01-rc1~35^2~91
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8a0b4e2dd7ce8a93ef49bed916e96c569a95ff23;p=oweals%2Fu-boot.git

x86: Move fsp_api.h inclusion out of fsp_support.h

This header file is different for each version of FSP. Move it into the
fsp_arch.h header file.

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

diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
index 2fa6619c03..c75afe9356 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -11,7 +11,6 @@
 #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 <asm/fsp_arch.h>
diff --git a/arch/x86/include/asm/fsp_arch.h b/arch/x86/include/asm/fsp_arch.h
index fb7f9109f7..b223141c44 100644
--- a/arch/x86/include/asm/fsp_arch.h
+++ b/arch/x86/include/asm/fsp_arch.h
@@ -14,6 +14,7 @@
  * since this file can be included from assembly.
  */
 
+#include <asm/fsp1/fsp_api.h>
 #include <asm/arch/fsp/fsp_vpd.h>
 #include <asm/arch/fsp/fsp_configs.h>