diff options
| author | Tom Rini <[email protected]> | 2020-09-01 11:02:54 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-09-01 11:02:54 -0400 |
| commit | 502f0489f125bfa52a9e0cc70bf8efb1117dfe05 (patch) | |
| tree | 64d087622c51919c67cfe02b4fbf52594f1d7c37 /cmd | |
| parent | 23e333a5c083a000d0cabc53f7c0d261bae9e5ca (diff) | |
| parent | 1150a0b6bd70084eb5c8b9ecfc60100cb7a768e2 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Fix parsing of "mtrr list" command
- Introduce USE_EARLY_BOARD_INIT option and remove dead codes for most
x86 boards
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/x86/mtrr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c index e118bba5a2a..99efecb9d8e 100644 --- a/cmd/x86/mtrr.c +++ b/cmd/x86/mtrr.c @@ -121,7 +121,8 @@ static int do_mtrr(struct cmd_tbl *cmdtp, int flag, int argc, if (argc < 1 || !cmd) { cmd = 'l'; reg = 0; - } else { + } + if (cmd != 'l') { if (argc < 2) return CMD_RET_USAGE; reg = simple_strtoul(argv[1], NULL, 16); |