summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-02-13 09:26:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-13 09:26:04 +0100
commitbb1a6a2fd3cc41be6db1a1362f311456019317b1 (patch)
tree72db0cbebe64670f6858e3a9955a62f1b6213299 /drivers
parenta06513273fc18c16b5081ddd80ce14b7de37cf6e (diff)
parentaa6f3cc4b46c90c485aed7e183199871348c4821 (diff)
downloadbarebox-bb1a6a2fd3cc41be6db1a1362f311456019317b1.tar.gz
Merge branch 'for-next/efi'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/efi-stdio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/efi-stdio.c b/drivers/serial/efi-stdio.c
index bf14c5e..5ab9173 100644
--- a/drivers/serial/efi-stdio.c
+++ b/drivers/serial/efi-stdio.c
@@ -99,9 +99,10 @@ static struct efi_ctrlkey ctrlkeys[] = {
{ 0x05, BB_KEY_HOME },
{ 0x06, BB_KEY_END },
{ 0x07, BB_KEY_INSERT },
- { 0x08, BB_KEY_DEL },
+ { 0x08, BB_KEY_DEL7 },
{ 0x09, BB_KEY_PAGEUP },
{ 0x0a, BB_KEY_PAGEDOWN },
+ { 0x17, 27 /* escape key */ },
};
static int efi_read_key(struct efi_console_priv *priv, bool wait)