summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-03 04:35:50 +0300
committerTom Rini <trini@konsulko.com>2021-08-03 04:35:50 +0300
commit3b64774323298362f9833aac75bb4639b4f98999 (patch)
tree34a6428754d442d5559a7131ff27225ec7c0663a /cmd
parent51aef405550e603ff702c034f0e2cd0f15bdf2bb (diff)
parent9feb5bdcc07b27806df07fd6b9260bb5cdef072d (diff)
downloadu-boot-3b64774323298362f9833aac75bb4639b4f98999.tar.xz
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- Fixed broken ICH SPI driver in software sequencer mode - Added "m25p,fast-read" to SPI flash node for x86 boards - Drop ROM_NEEDS_BLOBS and BUILD_ROM for x86 ROM builds - Define a default TSC timer frequency for all x86 boards - x86 MTRR MSR programming codes bug fixes - x86 "hob" command bug fixes - Don't program MTRR for DRAM for FSP1 - Move INIT_PHASE_END_FIRMWARE to FSP2 - Use external graphics card by default on Intel Crown Bay - tangier: Fix DMA controller IRQ polarity in CSRT
Diffstat (limited to 'cmd')
-rw-r--r--cmd/x86/hob.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 01db93eb3e..04d092dbe7 100644
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -78,7 +78,7 @@ static void show_hob_details(const struct hob_header *hdr)
const struct hob_res_desc *res = ptr;
const char *typename;
- typename = res->type > 0 && res->type <= RES_MAX_MEM_TYPE ?
+ typename = res->type >= RES_SYS_MEM && res->type <= RES_MAX_MEM_TYPE ?
res_type[res->type] : "unknown";
printf(" base = %08llx, len = %08llx, end = %08llx, type = %d (%s)\n\n",
@@ -158,8 +158,7 @@ static int do_hob(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
}
U_BOOT_CMD(hob, 3, 1, do_hob,
- "[-v] [seq] Print Hand-Off Block (HOB) information"
- " -v - Show detailed HOB information where available"
- " seq - Record # to show (all by default)",
- ""
+ "[-v] [seq] Print Hand-Off Block (HOB) information",
+ " -v - Show detailed HOB information where available\n"
+ " seq - Record # to show (all by default)"
);