Message ID | 1449813784-23365-9-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Accepted |
Delegated to: | Bin Meng |
Headers | show |
On 10 December 2015 at 23:03, Bin Meng <bmeng.cn@gmail.com> wrote: > All FSP spec v1.0 complaint FSP binary uses struct fspinit_rtbuf > as defined by the 1.0 spec, however there are FSPs that does not > follow 1.0 spec (possible due to that FSP predates the 1.0 spec), > and future FSP binary that is complaint to v1.1 spec defines an > optional paltform-specific runtime data in the struct fspinit_rtbuf. > Hence move the definition to chipset header. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Acked-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: None > > arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h | 4 ++++ > arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h | 4 ++++ > arch/x86/include/asm/fsp/fsp_platform.h | 15 --------------- > arch/x86/include/asm/fsp/fsp_support.h | 1 - > 4 files changed, 8 insertions(+), 16 deletions(-) > delete mode 100644 arch/x86/include/asm/fsp/fsp_platform.h Tested on Minnowmax: Tested-by: Simon Glass <sjg@chromium.org>
On Sat, Dec 19, 2015 at 10:51 AM, Simon Glass <sjg@chromium.org> wrote: > On 10 December 2015 at 23:03, Bin Meng <bmeng.cn@gmail.com> wrote: >> All FSP spec v1.0 complaint FSP binary uses struct fspinit_rtbuf >> as defined by the 1.0 spec, however there are FSPs that does not >> follow 1.0 spec (possible due to that FSP predates the 1.0 spec), >> and future FSP binary that is complaint to v1.1 spec defines an >> optional paltform-specific runtime data in the struct fspinit_rtbuf. >> Hence move the definition to chipset header. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> Acked-by: Simon Glass <sjg@chromium.org> >> --- >> >> Changes in v2: None >> >> arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h | 4 ++++ >> arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h | 4 ++++ >> arch/x86/include/asm/fsp/fsp_platform.h | 15 --------------- >> arch/x86/include/asm/fsp/fsp_support.h | 1 - >> 4 files changed, 8 insertions(+), 16 deletions(-) >> delete mode 100644 arch/x86/include/asm/fsp/fsp_platform.h > > Tested on Minnowmax: > Tested-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86/next, thanks!
diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h index 87c7d35..e539890 100644 --- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h @@ -12,4 +12,8 @@ struct fsp_config_data { struct upd_region fsp_upd; }; +struct fspinit_rtbuf { + struct common_buf common; /* FSP common runtime data structure */ +}; + #endif /* __FSP_CONFIGS_H__ */ diff --git a/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h b/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h index 87c7d35..e539890 100644 --- a/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h +++ b/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h @@ -12,4 +12,8 @@ struct fsp_config_data { struct upd_region fsp_upd; }; +struct fspinit_rtbuf { + struct common_buf common; /* FSP common runtime data structure */ +}; + #endif /* __FSP_CONFIGS_H__ */ diff --git a/arch/x86/include/asm/fsp/fsp_platform.h b/arch/x86/include/asm/fsp/fsp_platform.h deleted file mode 100644 index 61286ce..0000000 --- a/arch/x86/include/asm/fsp/fsp_platform.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) 2013, Intel Corporation - * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> - * - * SPDX-License-Identifier: Intel - */ - -#ifndef __FSP_PLATFORM_H__ -#define __FSP_PLATFORM_H__ - -struct fspinit_rtbuf { - struct common_buf common; /* FSP common runtime data structure */ -}; - -#endif diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h index 67741cc..e65a130 100644 --- a/arch/x86/include/asm/fsp/fsp_support.h +++ b/arch/x86/include/asm/fsp/fsp_support.h @@ -13,7 +13,6 @@ #include "fsp_ffs.h" #include "fsp_api.h" #include "fsp_hob.h" -#include "fsp_platform.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" #include <asm/arch/fsp/fsp_vpd.h>