summaryrefslogtreecommitdiffstats
path: root/arch/efi
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2014-07-08 18:38:34 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-16 10:46:19 +0200
commit9183a8c683014f7f6dae004009556c9c0d4d2a15 (patch)
tree580495f15548e46066e3e7a0a2c28b7d2688d522 /arch/efi
parentef4f9d77b72c2349e7dfcdb2de9f60ed758e1888 (diff)
downloadbarebox-9183a8c683014f7f6dae004009556c9c0d4d2a15.tar.gz
barebox-9183a8c683014f7f6dae004009556c9c0d4d2a15.tar.xz
EFI: introduce efi_strguid to convert GUID to human readable names
use in devinfo Protocols Tested today on qemu with all the GUID translated Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/efi')
-rw-r--r--arch/efi/efi/efi-device.c3
-rw-r--r--arch/efi/efi/efi.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/efi/efi/efi-device.c b/arch/efi/efi/efi-device.c
index 71526b999..1c9553d90 100644
--- a/arch/efi/efi/efi-device.c
+++ b/arch/efi/efi/efi-device.c
@@ -86,7 +86,8 @@ static void efi_devinfo(struct device_d *dev)
printf("Protocols:\n");
for (i = 0; i < efidev->num_guids; i++)
- printf(" %d: %pUl\n", i, &efidev->guids[i]);
+ printf(" %d: %pUl: %s\n", i, &efidev->guids[i],
+ efi_guid_string(&efidev->guids[i]));
}
static efi_handle_t *efi_find_parent(efi_handle_t *handle)
diff --git a/arch/efi/efi/efi.c b/arch/efi/efi/efi.c
index 48b7d9a43..ff97783b1 100644
--- a/arch/efi/efi/efi.c
+++ b/arch/efi/efi/efi.c
@@ -36,6 +36,7 @@
#include <binfmt.h>
#include <wchar.h>
#include <envfs.h>
+#include <efi.h>
#include <mach/efi.h>
#include <mach/efi-device.h>
@@ -233,6 +234,8 @@ static struct NS16550_plat ns16550_plat = {
static int efi_console_init(void)
{
+ barebox_set_model("barebox EFI payload");
+
add_generic_device("efi-stdio", DEVICE_ID_SINGLE, NULL, 0 , 0, 0, NULL);
if (IS_ENABLED(CONFIG_ARCH_EFI_REGISTER_COM1))
@@ -296,8 +299,6 @@ static void fixup_tables(void)
static int efi_init(void)
{
- barebox_set_model("barebox EFI payload");
-
defaultenv_append_directory(env_efi);
return 0;