diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-27 10:55:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-27 10:55:55 -0400 |
| commit | 0d6a3e23225ad8c8e302044f8f720f657edda4f7 (patch) | |
| tree | a007bea38f55122ef7c74169e22106c8efeaf42f /cmd | |
| parent | 0ab24c37f03a3a23982edb63d88c4f22bb8bc2c5 (diff) | |
| parent | 0621b5e1eeb6bcf08b220136f09d433d880f65a5 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Use device tree for FSP-M and FSP-S configuration on Intel Apollo Lake
- Add SMBIOS cbmem entry parsing for coreboot
- Various clean-ups to CBFS implementation
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/cbfs.c | 3 | ||||
| -rw-r--r-- | cmd/x86/mtrr.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/cmd/cbfs.c b/cmd/cbfs.c index 8e91d4bb8c..10c2c929c3 100644 --- a/cmd/cbfs.c +++ b/cmd/cbfs.c @@ -28,8 +28,7 @@ static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc, return 1; } } - file_cbfs_init(end_of_rom); - if (cbfs_get_result() != CBFS_SUCCESS) { + if (file_cbfs_init(end_of_rom)) { printf("%s.\n", file_cbfs_error()); return 1; } diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c index 2c40e711a1..084d7315f4 100644 --- a/cmd/x86/mtrr.c +++ b/cmd/x86/mtrr.c @@ -73,7 +73,6 @@ static int do_mtrr_set(uint reg, int argc, char *const argv[]) if (valid) mask |= MTRR_PHYS_MASK_VALID; - printf("base=%llx, mask=%llx\n", base, mask); mtrr_open(&state, true); wrmsrl(MTRR_PHYS_BASE_MSR(reg), base); wrmsrl(MTRR_PHYS_MASK_MSR(reg), mask); |