From 9183a8c683014f7f6dae004009556c9c0d4d2a15 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 8 Jul 2014 18:38:34 +0200 Subject: 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 Signed-off-by: Sascha Hauer --- arch/efi/efi/efi-device.c | 3 ++- arch/efi/efi/efi.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/efi/efi/efi-device.c b/arch/efi/efi/efi-device.c index 71526b999f..1c9553d906 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 48b7d9a438..ff97783b13 100644 --- a/arch/efi/efi/efi.c +++ b/arch/efi/efi/efi.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -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; -- cgit v1.2.3