| Message ID | BLU436-SMTP9188EEF0F539AFB2477E59BF720@phx.gbl |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 8 August 2015 at 08:01, Bin Meng <bmeng.cn@gmail.com> wrote: > When using different release version of Intel FSP, the VPD_IMAGE_REV > is different (ie: BayTrail Gold 3 is 0x0303 while Gold 4 is 0x0304). > Remove the asserting of this so that U-Boot does not hang in a debug > build. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h | 1 - > arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h | 1 - > arch/x86/lib/fsp/fsp_support.c | 3 +-- > 3 files changed, 1 insertion(+), 4 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 8 August 2015 at 08:10, Simon Glass <sjg@chromium.org> wrote: > On 8 August 2015 at 08:01, Bin Meng <bmeng.cn@gmail.com> wrote: >> When using different release version of Intel FSP, the VPD_IMAGE_REV >> is different (ie: BayTrail Gold 3 is 0x0303 while Gold 4 is 0x0304). >> Remove the asserting of this so that U-Boot does not hang in a debug >> build. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h | 1 - >> arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h | 1 - >> arch/x86/lib/fsp/fsp_support.c | 3 +-- >> 3 files changed, 1 insertion(+), 4 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-x86, thanks!
diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h index eb0d506..3c782a8 100644 --- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h +++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h @@ -82,7 +82,6 @@ struct __packed upd_region { }; #define VPD_IMAGE_ID 0x3157454956594C56 /* 'VLYVIEW1' */ -#define VPD_IMAGE_REV 0x00000303 struct __packed vpd_region { uint64_t sign; /* Offset 0x0000 */ diff --git a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h index 3c57558..9c54ecc 100644 --- a/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h +++ b/arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h @@ -35,7 +35,6 @@ struct __packed upd_region { }; #define VPD_IMAGE_ID 0x445056574F4E4E4D /* 'MNNOWVPD' */ -#define VPD_IMAGE_REV 0x00000301 struct __packed vpd_region { u64 sign; /* Offset 0x0000 */ diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c index 4585166..1d48ff4 100644 --- a/arch/x86/lib/fsp/fsp_support.c +++ b/arch/x86/lib/fsp/fsp_support.c @@ -147,8 +147,7 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf) fsp_hdr->cfg_region_off); /* Verify the VPD data region is valid */ - assert((fsp_vpd->img_rev == VPD_IMAGE_REV) && - (fsp_vpd->sign == VPD_IMAGE_ID)); + assert(fsp_vpd->sign == VPD_IMAGE_ID); /* Copy default data from Flash */ memcpy(fsp_upd, (void *)(fsp_hdr->img_base + fsp_vpd->upd_offset),
When using different release version of Intel FSP, the VPD_IMAGE_REV is different (ie: BayTrail Gold 3 is 0x0303 while Gold 4 is 0x0304). Remove the asserting of this so that U-Boot does not hang in a debug build. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h | 1 - arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h | 1 - arch/x86/lib/fsp/fsp_support.c | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-)