| Message ID | 20190824144422.235024-3-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: Prepare for adding FSP2 code | expand |
Hi Simon, On Sat, Aug 24, 2019 at 10:44 PM Simon Glass <sjg@chromium.org> wrote: > > 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> > --- > > Changes in v2: > - Rewrite to make azalia a common file for FSP1 and FSP2 > > arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h | 0 > arch/x86/include/asm/fsp1/fsp_support.h | 5 ++++- > 2 files changed, 4 insertions(+), 1 deletion(-) > rename arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h (100%) > > diff --git a/arch/x86/include/asm/fsp1/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h > similarity index 100% > rename from arch/x86/include/asm/fsp1/fsp_azalia.h > rename to arch/x86/include/asm/fsp/fsp_azalia.h > diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h > index 7b92392a27..487c751fcf 100644 > --- a/arch/x86/include/asm/fsp1/fsp_support.h > +++ b/arch/x86/include/asm/fsp1/fsp_support.h > @@ -14,7 +14,7 @@ > #include "fsp_api.h" > #include "fsp_infoheader.h" > #include "fsp_bootmode.h" > -#include "fsp_azalia.h" > +#include <asm/fsp/fsp_azalia.h> > #include <asm/arch/fsp/fsp_vpd.h> > #include <asm/arch/fsp/fsp_configs.h> > > @@ -22,6 +22,9 @@ > #define FSP_HIGHMEM_BASE 0x100000000ULL > #define UPD_TERMINATOR 0x55AA > > +struct efi_guid; > +struct fspinit_rtbuf; > +struct fsp_config_data; Why are these 3 needed? I thought they are from "fsp_azalia.h", but they are not. > > /** > * FSP Continuation assembly helper routine > -- Regards, Bin
diff --git a/arch/x86/include/asm/fsp1/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_azalia.h rename to arch/x86/include/asm/fsp/fsp_azalia.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 7b92392a27..487c751fcf 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -14,7 +14,7 @@ #include "fsp_api.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" -#include "fsp_azalia.h" +#include <asm/fsp/fsp_azalia.h> #include <asm/arch/fsp/fsp_vpd.h> #include <asm/arch/fsp/fsp_configs.h> @@ -22,6 +22,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
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> --- Changes in v2: - Rewrite to make azalia a common file for FSP1 and FSP2 arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h | 0 arch/x86/include/asm/fsp1/fsp_support.h | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h (100%)