leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: fsp: Do not assert VPD_IMAGE_REV when DEBUG

Browse Source 
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>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2015-08-08 22:01:23 +08:00 committed by Simon Glass
parent f3b84a3032
commit da60fb7934
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h
View File

@ -82,7 +82,6 @@ struct __packed upd_region {
}; };
#define VPD_IMAGE_ID 0x3157454956594C56 /* 'VLYVIEW1' */ #define VPD_IMAGE_ID 0x3157454956594C56 /* 'VLYVIEW1' */
#define VPD_IMAGE_REV 0x00000303
struct __packed vpd_region { struct __packed vpd_region {
uint64_t sign; /* Offset 0x0000 */ uint64_t sign; /* Offset 0x0000 */

1
arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h
View File

@ -35,7 +35,6 @@ struct __packed upd_region {
}; };
#define VPD_IMAGE_ID 0x445056574F4E4E4D /* 'MNNOWVPD' */ #define VPD_IMAGE_ID 0x445056574F4E4E4D /* 'MNNOWVPD' */
#define VPD_IMAGE_REV 0x00000301
struct __packed vpd_region { struct __packed vpd_region {
u64 sign; /* Offset 0x0000 */ u64 sign; /* Offset 0x0000 */

3
arch/x86/lib/fsp/fsp_support.c
View File

@ -147,8 +147,7 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
fsp_hdr->cfg_region_off); fsp_hdr->cfg_region_off);
/* Verify the VPD data region is valid */ /* Verify the VPD data region is valid */
assert((fsp_vpd->img_rev == VPD_IMAGE_REV) && assert(fsp_vpd->sign == VPD_IMAGE_ID);
(fsp_vpd->sign == VPD_IMAGE_ID));
/* Copy default data from Flash */ /* Copy default data from Flash */
memcpy(fsp_upd, (void *)(fsp_hdr->img_base + fsp_vpd->upd_offset), memcpy(fsp_upd, (void *)(fsp_hdr->img_base + fsp_vpd->upd_offset),