summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2017-02-15 20:34:15 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-27 08:33:14 +0100
commit4c29a9511b0d95780c914d1b4277dae4061786d2 (patch)
tree88ce3440f17aff14fde1ffc5b4026c202955f8d4 /commands
parent64db2d497ca4e1db7be08e303c17ed92c99af897 (diff)
downloadbarebox-4c29a9511b0d95780c914d1b4277dae4061786d2.tar.gz
barebox-4c29a9511b0d95780c914d1b4277dae4061786d2.tar.xz
efi: move x86 efi boot support to x86 arch
prepare to drop the efi arch as efi boot up is not arch sepecific Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
-rw-r--r--commands/Kconfig2
-rw-r--r--commands/edit.c2
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;