diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:43 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:43 +0100 |
| commit | 93c55ce0986a47f5b6774a81443e9b3a15fc727c (patch) | |
| tree | 06860f7e46e7a08b7ecd08ba105a8101a900f037 /commands | |
| parent | 12b6a916d608200a511611c4dfbe84cf4cde8add (diff) | |
| parent | 534c1fac3e684eefcd9d0372dbf26745a84719ad (diff) | |
| download | barebox-93c55ce0986a47f5b6774a81443e9b3a15fc727c.tar.gz barebox-93c55ce0986a47f5b6774a81443e9b3a15fc727c.tar.xz | |
Merge branch 'for-next/efi'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/Kconfig | 2 | ||||
| -rw-r--r-- | commands/edit.c | 2 |
2 files changed, 2 insertions, 2 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; |