diff mbox series

[U-Boot,02/10] x86: fsp: Move fsp_azalia include out of fsp_support.h

Message ID 20190818225117.142845-3-sjg@chromium.org
State Superseded
Delegated to: Bin Meng
Headers show
Series [U-Boot,01/10] x86: Rename existing FSP code to fsp1 | expand

Commit Message

Simon Glass Aug. 18, 2019, 10:51 p.m. UTC
This file is only used by one board and we don't need the types for most
FSP files so it is wasteful to include it so widely. Drop it from this
header.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 arch/x86/cpu/braswell/fsp_configs.c                       | 1 +
 arch/x86/include/asm/fsp1/fsp_support.h                   | 4 +++-
 board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

Comments

Bin Meng Aug. 20, 2019, 3:33 a.m. UTC | #1
Hi Simon,

On Mon, Aug 19, 2019 at 6:51 AM Simon Glass <sjg@chromium.org> wrote:
>
> This file is only used by one board and we don't need the types for most

Two boards based on the changes in the commit.

> FSP files so it is wasteful to include it so widely. Drop it from this
> header.
>

But it does no harm to include this header, right? Does FSPv2 not
support the fsp_azalia struct?

> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  arch/x86/cpu/braswell/fsp_configs.c                       | 1 +
>  arch/x86/include/asm/fsp1/fsp_support.h                   | 4 +++-
>  board/advantech/som-db5800-som-6867/som-db5800-som-6867.c | 1 +
>  3 files changed, 5 insertions(+), 1 deletion(-)
>

Regards,
Bin
diff mbox series

Patch

diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c
index 607e333f21..6f217ce7d6 100644
--- a/arch/x86/cpu/braswell/fsp_configs.c
+++ b/arch/x86/cpu/braswell/fsp_configs.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdtdec.h>
+#include <asm/fsp1/fsp_azalia.h>
 #include <asm/fsp1/fsp_support.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
index 7b92392a27..72fbcbc393 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -14,7 +14,6 @@ 
 #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>
 
@@ -22,6 +21,9 @@ 
 #define FSP_HIGHMEM_BASE	0x100000000ULL
 #define UPD_TERMINATOR		0x55AA
 
+struct efi_guid;
+struct fspinit_rtbuf;
+struct fsp_config_data;
 
 /**
  * FSP Continuation assembly helper routine
diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
index 8f4c587371..212f77fd62 100644
--- a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
+++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <asm/fsp1/fsp_azalia.h>
 #include <asm/fsp1/fsp_support.h>
 
 /* ALC262 Verb Table - 10EC0262 */