[U-Boot] [PATCH v3 07/10] x86: Move fsp_hob.h to the generic fsp directory

Bin Meng bmeng.cn at gmail.com
Wed Oct 2 11:00:02 UTC 2019


On Wed, Oct 2, 2019 at 8:05 AM Bin Meng <bmeng.cn at gmail.com> wrote:
>
> On Wed, Oct 2, 2019 at 8:00 AM Bin Meng <bmeng.cn at gmail.com> wrote:
> >
> > On Wed, Sep 25, 2019 at 10:00 PM Simon Glass <sjg at 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 at chromium.org>
> > > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
> > > ---
> > >
> > > Changes in v3: None
> > > Changes in v2: None
> > >
> > >  arch/x86/include/asm/{fsp1 => fsp}/fsp_hob.h        | 0
> > >  arch/x86/include/asm/{fsp1 => fsp}/fsp_infoheader.h | 0
> > >  arch/x86/include/asm/fsp1/fsp_support.h             | 1 +
> > >  3 files changed, 1 insertion(+)
> > >  rename arch/x86/include/asm/{fsp1 => fsp}/fsp_hob.h (100%)
> > >  rename arch/x86/include/asm/{fsp1 => fsp}/fsp_infoheader.h (100%)
> > >
> > > diff --git a/arch/x86/include/asm/fsp1/fsp_hob.h b/arch/x86/include/asm/fsp/fsp_hob.h
> > > similarity index 100%
> > > rename from arch/x86/include/asm/fsp1/fsp_hob.h
> > > rename to arch/x86/include/asm/fsp/fsp_hob.h
> > > 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
>
> The rename of fsp_infoheader.h should be in the next patch, to keep
> the bisectability.
>
> I will fix it when applying.
>
> > > diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
> > > index de3b1936be8..2f1c5fbb546 100644
> > > --- a/arch/x86/include/asm/fsp1/fsp_support.h
> > > +++ b/arch/x86/include/asm/fsp1/fsp_support.h
> > > @@ -8,6 +8,7 @@
> > >  #define __FSP_SUPPORT_H__
> > >
> > >  #include <asm/fsp/fsp_fv.h>
> > > +#include <asm/fsp/fsp_hob.h>
> > >  #include <asm/fsp/fsp_types.h>
> > >  #include "fsp_hob.h"
> >
> > This line should be dropped. I will fix it when applying.
> >

Fixed all the issues, and

applied to u-boot-x86/next, thanks!


More information about the U-Boot mailing list