brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

x86: Update the fsp command for FSP2

Browse Source 
The current 'fsp' command only works with FSP1. Update it to handle FSP2
as well. Convert everything to hex which is what U-Boot uses.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-12-06 21:42:27 -07:00 committed by Bin Meng
parent 86a8fb3b3b
commit b75617b035
1 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
cmd/x86/fsp.c
View File

@ -5,23 +5,38 @@
#include <common.h>
#include <command.h>
#include <asm/fsp1/fsp_support.h>
#include <asm/fsp/fsp_support.h>
DECLARE_GLOBAL_DATA_PTR;
static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
struct fsp_header *hdr = fsp_find_header();
u32 img_addr = hdr->img_base;
char *sign = (char *)&hdr->sign;
struct fsp_header *hdr;
u32 img_addr;
char *sign;
uint addr;
int i;
printf("FSP : binary 0x%08x, header 0x%08x\n",
CONFIG_FSP_ADDR, (int)hdr);
#ifdef CONFIG_FSP_VERSION2
/*
* Only FSP-S is displayed. FSP-M was used in SPL but may not still be
* around, and we didn't keep a pointer to it.
*/
hdr = gd->arch.fsp_s_hdr;
img_addr = hdr->img_base;
addr = img_addr;
#else
addr = CONFIG_FSP_ADDR;
hdr = fsp_find_header();
img_addr = hdr->img_base;
#endif
sign = (char *)&hdr->sign;
printf("FSP : binary %08x, header %08x\n", addr, (int)hdr);
printf("Header : sign ");
for (i = 0; i < sizeof(hdr->sign); i++)
printf("%c", *sign++);
printf(", size %d, rev %d\n", hdr->hdr_len, hdr->hdr_rev);
printf(", size %x, rev %d\n", hdr->hdr_len, hdr->hdr_rev);
printf("Image : rev ");
if (hdr->hdr_rev == FSP_HEADER_REVISION_1) {
printf("%d.%d",
@ -34,24 +49,32 @@ static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
printf(", id ");
for (i = 0; i < ARRAY_SIZE(hdr->img_id); i++)
printf("%c", hdr->img_id[i]);
printf(", addr 0x%08x, size %d\n", img_addr, hdr->img_size);
if (hdr->hdr_rev == FSP_HEADER_REVISION_2) {
printf(", addr %08x, size %x\n", img_addr, hdr->img_size);
if (hdr->hdr_rev >= FSP_HEADER_REVISION_1) {
printf("GFX :%ssupported\n",
hdr->img_attr & FSP_ATTR_GRAPHICS_SUPPORT ? " " : " un");
}
printf("VPD : addr 0x%08x, size %d\n",
printf("VPD : addr %08x, size %x\n",
hdr->cfg_region_off + img_addr, hdr->cfg_region_size);
printf("\nNumber of APIs Supported : %d\n", hdr->api_num);
printf("\tTempRamInit : 0x%08x\n", hdr->fsp_tempram_init + img_addr);
printf("\tFspInit : 0x%08x\n", hdr->fsp_init + img_addr);
printf("\tFspNotify : 0x%08x\n", hdr->fsp_notify + img_addr);
if (hdr->hdr_rev == FSP_HEADER_REVISION_2) {
printf("\tMemoryInit : 0x%08x\n",
hdr->fsp_mem_init + img_addr);
printf("\tTempRamExit : 0x%08x\n",
hdr->fsp_tempram_exit + img_addr);
printf("\tSiliconInit : 0x%08x\n",
hdr->fsp_silicon_init + img_addr);
if (hdr->hdr_rev <= FSP_HEADER_REVISION_2)
printf("\nNumber of APIs Supported : %d\n", hdr->api_num);
if (hdr->fsp_tempram_init)
printf("\tTempRamInit : %08x\n",
hdr->fsp_tempram_init + img_addr);
if (hdr->fsp_init)
printf("\tFspInit : %08x\n", hdr->fsp_init + img_addr);
if (hdr->fsp_notify)
printf("\tFspNotify : %08x\n", hdr->fsp_notify + img_addr);
if (hdr->hdr_rev >= FSP_HEADER_REVISION_1) {
if (hdr->fsp_mem_init)
printf("\tMemoryInit : %08x\n",
hdr->fsp_mem_init + img_addr);
if (hdr->fsp_tempram_exit)
printf("\tTempRamExit : %08x\n",
hdr->fsp_tempram_exit + img_addr);
if (hdr->fsp_silicon_init)
printf("\tSiliconInit : %08x\n",
hdr->fsp_silicon_init + img_addr);
}
return 0;