Переглянути джерело

x86: fsp: Do not assert VPD_IMAGE_REV when DEBUG

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>
Bin Meng 9 роки тому
батько
коміт
da60fb7934

+ 0 - 1
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 */

+ 0 - 1
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 */

+ 1 - 2
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),