diff options
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/Kconfig | 2 | ||||
| -rw-r--r-- | commands/edit.c | 2 | ||||
| -rw-r--r-- | commands/memcmp.c | 4 | ||||
| -rw-r--r-- | commands/mmc_extcsd.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 21d921268f..bc0885c69d 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -370,7 +370,7 @@ config CMD_BOOTZ config CMD_LINUX16 tristate - depends on X86 + depends on X86 && !X86_EFI default y if X86 prompt "linux16" help diff --git a/commands/edit.c b/commands/edit.c index a5415a6e5b..696a818d9d 100644 --- a/commands/edit.c +++ b/commands/edit.c @@ -396,7 +396,7 @@ static int do_edit(int argc, char *argv[]) * down when we write to the right bottom screen position. Reduce the number * of rows by one to work around this. */ - if (IS_ENABLED(CONFIG_ARCH_EFI)) + if (IS_ENABLED(CONFIG_EFI_BOOTUP)) screenheight = 24; else screenheight = 25; diff --git a/commands/memcmp.c b/commands/memcmp.c index 7be0033f55..981c8cb38d 100644 --- a/commands/memcmp.c +++ b/commands/memcmp.c @@ -91,13 +91,13 @@ static int do_memcmp(int argc, char *argv[]) now = min((loff_t)RW_BUF_SIZE, count); - r1 = read(sourcefd, mem_rw_buf, now); + r1 = read_full(sourcefd, mem_rw_buf, now); if (r1 < 0) { perror("read"); goto out; } - r2 = read(destfd, rw_buf1, now); + r2 = read_full(destfd, rw_buf1, now); if (r2 < 0) { perror("read"); goto out; diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c index d7fc50697c..42adfe0860 100644 --- a/commands/mmc_extcsd.c +++ b/commands/mmc_extcsd.c @@ -5,7 +5,7 @@ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, |