diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-19 09:21:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-19 09:21:46 -0400 |
| commit | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (patch) | |
| tree | 1ae055f2a6243c62af81ac0ce31fc49db3f8f2e2 /cmd/cbfs.c | |
| parent | 81fed78c0a59af0d5698b13608eb4d26be84f397 (diff) | |
| parent | d117f917bfd2ccf4eaf90bddfa256501a554b1a4 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- QEMU build warning fix when CONFIG_DISTRO_DEFAULTS=n
- Small fixes on x86 reST docs
- Allow CBFS to be used in SPL
- Remove x86 specific GD flags
Diffstat (limited to 'cmd/cbfs.c')
| -rw-r--r-- | cmd/cbfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/cbfs.c b/cmd/cbfs.c index 3d1fc959720..98e652a4e7b 100644 --- a/cmd/cbfs.c +++ b/cmd/cbfs.c @@ -29,7 +29,7 @@ static int do_cbfs_init(cmd_tbl_t *cmdtp, int flag, int argc, } } file_cbfs_init(end_of_rom); - if (file_cbfs_result != CBFS_SUCCESS) { + if (cbfs_get_result() != CBFS_SUCCESS) { printf("%s.\n", file_cbfs_error()); return 1; } @@ -67,7 +67,7 @@ static int do_cbfs_fsload(cmd_tbl_t *cmdtp, int flag, int argc, file = file_cbfs_find(argv[2]); if (!file) { - if (file_cbfs_result == CBFS_FILE_NOT_FOUND) + if (cbfs_get_result() == CBFS_FILE_NOT_FOUND) printf("%s: %s\n", file_cbfs_error(), argv[2]); else printf("%s.\n", file_cbfs_error()); |