diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-14 17:43:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-14 20:27:16 (GMT) |
| commit | 632093b566569329bc6e5b0893bdca01de905314 (patch) | |
| tree | ddd8cb84789bf0bc60a566fd8d33ff138d6861e9 /arch/x86/lib | |
| parent | 61dfa65e405f2713dfc8090ed8147ec33b003717 (diff) | |
| parent | 236efe36be6d1c544f9477f10fdf38a17cd7a869 (diff) | |
| download | u-boot-632093b566569329bc6e5b0893bdca01de905314.tar.xz | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/fsp/fsp_common.c | 13 | ||||
| -rw-r--r-- | arch/x86/lib/fsp/fsp_support.c | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index c585710..d564cb9 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -19,19 +19,24 @@ int print_cpuinfo(void) return default_print_cpuinfo(); } -int board_pci_post_scan(struct pci_controller *hose) +int fsp_init_phase_pci(void) { u32 status; /* call into FspNotify */ debug("Calling into FSP (notify phase INIT_PHASE_PCI): "); status = fsp_notify(NULL, INIT_PHASE_PCI); - if (status != FSP_SUCCESS) + if (status) debug("fail, error code %x\n", status); else debug("OK\n"); - return 0; + return status ? -EPERM : 0; +} + +int board_pci_post_scan(struct pci_controller *hose) +{ + return fsp_init_phase_pci(); } void board_final_cleanup(void) @@ -41,7 +46,7 @@ void board_final_cleanup(void) /* call into FspNotify */ debug("Calling into FSP (notify phase INIT_PHASE_BOOT): "); status = fsp_notify(NULL, INIT_PHASE_BOOT); - if (status != FSP_SUCCESS) + if (status) debug("fail, error code %x\n", status); else debug("OK\n"); 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), |