From patchwork Fri Dec 20 16:44:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 22681 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E73C0202AE for ; Fri, 20 Dec 2013 16:44:30 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id o6sf11381180oag.11 for ; Fri, 20 Dec 2013 08:44:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=uB5FH553C6lAuxwnbwCV5M1eKaT1dnCRvDZXE6hegy8=; b=AGOVk4HFsN68oHnAL+SkuK0QOfPPo31eJMvqLt7R6RtN9GQ5a/etyVxZv6EGekmQK2 q8EuhM12na15spDMadvD2zVutAraRvCo/nsjLmhrR9N+v7DbtHFzeA+mPkiS29x4oCqm TO/4yVJd0bIg9cUZ6Qh0sf7R0Ei8VniwR6WZ0p/wbInStuJcrjJhhYxzZ/YrJncadpVy ukGVKxbd4Xc5aph/jIZ0JzgnpF2wGcnzM19zhf8KwgezXYNRV/6IIyDGnlLN0DjiTOzP uEhiEh2ZTRb+1K5lkOJScC3Qb1eHWcGepCWMJnnHGa4UtkmZzJWf0/w7yrbjnE5+y7BI o+7w== X-Gm-Message-State: ALoCoQmB3qpZcGTyAR6t0m/NPlJ6AYC723xuHvqIGxj2gaubV82bsSrPgxEMRVxy05Oh95E2U4J1 X-Received: by 10.50.126.69 with SMTP id mw5mr4599732igb.7.1387557869996; Fri, 20 Dec 2013 08:44:29 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.241 with SMTP id b17ls843390qec.11.gmail; Fri, 20 Dec 2013 08:44:29 -0800 (PST) X-Received: by 10.52.166.6 with SMTP id zc6mr4699772vdb.10.1387557869866; Fri, 20 Dec 2013 08:44:29 -0800 (PST) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id pu5si1630866veb.21.2013.12.20.08.44.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Dec 2013 08:44:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so1575001veb.26 for ; Fri, 20 Dec 2013 08:44:29 -0800 (PST) X-Received: by 10.52.135.201 with SMTP id pu9mr4576665vdb.13.1387557869750; Fri, 20 Dec 2013 08:44:29 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp74917ved; Fri, 20 Dec 2013 08:44:29 -0800 (PST) X-Received: by 10.180.90.37 with SMTP id bt5mr8649855wib.43.1387557868267; Fri, 20 Dec 2013 08:44:28 -0800 (PST) Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by mx.google.com with ESMTPS id dl9si3358076wjb.51.2013.12.20.08.44.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Dec 2013 08:44:28 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.170 is neither permitted nor denied by best guess record for domain of leif.lindholm@linaro.org) client-ip=74.125.82.170; Received: by mail-we0-f170.google.com with SMTP id w61so2747019wes.15 for ; Fri, 20 Dec 2013 08:44:24 -0800 (PST) X-Received: by 10.194.175.66 with SMTP id by2mr2981950wjc.59.1387557863988; Fri, 20 Dec 2013 08:44:23 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id bc5sm15458587wib.4.2013.12.20.08.44.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Dec 2013 08:44:23 -0800 (PST) From: Leif Lindholm To: grub-devel@gnu.org Cc: patches@linaro.org, Leif Lindholm Subject: [PATCH v3 2/2] arm64: add EFI Linux loader Date: Fri, 20 Dec 2013 16:44:48 +0000 Message-Id: <1387557889-14365-1-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Bugfix of v2 loaded_fdt handling and removal of redundant typedefs. --- grub-core/Makefile.core.def | 3 +- grub-core/loader/arm64/linux.c | 479 ++++++++++++++++++++++++++++++++++++++++ include/grub/arm64/linux.h | 54 +++++ include/grub/efi/api.h | 4 + 4 files changed, 539 insertions(+), 1 deletion(-) create mode 100644 grub-core/loader/arm64/linux.c create mode 100644 include/grub/arm64/linux.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index e5e558c..c916246 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1672,7 +1672,8 @@ module = { sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c; ia64_efi = loader/ia64/efi/linux.c; arm = loader/arm/linux.c; - arm = lib/fdt.c; + arm64 = loader/arm64/linux.c; + fdt = lib/fdt.c; common = loader/linux.c; common = lib/cmdline.c; enable = noemu; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c new file mode 100644 index 0000000..52c6160 --- /dev/null +++ b/grub-core/loader/arm64/linux.c @@ -0,0 +1,479 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2013 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +GRUB_MOD_LICENSE ("GPLv3+"); + +#define GRUB_EFI_PAGE_SHIFT 12 +#define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> GRUB_EFI_PAGE_SHIFT) +#define GRUB_EFI_PE_MAGIC 0x5A4D + +static grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; + +static grub_dl_t my_mod; +static int loaded; + +static void *kernel_addr; +static grub_uint64_t kernel_size; + +static char *linux_args; +static grub_uint32_t cmdline_size; + +static grub_addr_t initrd_start; +static grub_addr_t initrd_end; + +static void *loaded_fdt; +static void *fdt; + +static void * +get_firmware_fdt (void) +{ + grub_efi_configuration_table_t *tables; + void *firmware_fdt = NULL; + unsigned int i; + + /* Look for FDT in UEFI config tables. */ + tables = grub_efi_system_table->configuration_table; + + for (i = 0; i < grub_efi_system_table->num_table_entries; i++) + if (grub_memcmp (&tables[i].vendor_guid, &fdt_guid, sizeof (fdt_guid)) == 0) + { + firmware_fdt = tables[i].vendor_table; + grub_dprintf ("linux", "found registered FDT @ 0x%p\n", firmware_fdt); + break; + } + + return firmware_fdt; +} + +static void +get_fdt (void) +{ + void *raw_fdt; + int size; + + if (fdt) + { + size = BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt)); + grub_efi_free_pages ((grub_efi_physical_address_t) fdt, size); + } + + if (loaded_fdt) + raw_fdt = loaded_fdt; + else + raw_fdt = get_firmware_fdt(); + + size = + raw_fdt ? grub_fdt_get_totalsize (raw_fdt) : GRUB_FDT_EMPTY_TREE_SZ; + size += 0x400; + + grub_dprintf ("linux", "allocating %d bytes for fdt\n", size); + fdt = grub_efi_allocate_pages (0, BYTES_TO_PAGES (size)); + if (!fdt) + return; + + if (raw_fdt) + { + grub_memmove (fdt, raw_fdt, size); + grub_fdt_set_totalsize (fdt, size); + } + else + { + grub_fdt_create_empty_tree (fdt, size); + } +} + +static grub_err_t +check_kernel (struct linux_kernel_header *lh) +{ + if (lh->magic != GRUB_LINUX_MAGIC) + return grub_error(GRUB_ERR_BAD_OS, N_("Invalid kernel image")); + + if ((lh->code0 & 0xffff) != GRUB_EFI_PE_MAGIC) + return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, + N_("Plain Image kernel not supported - rebuild with CONFIG_UEFI_STUB enabled.\n")); + + grub_dprintf ("linux", "UEFI stub kernel:\n"); + grub_dprintf ("linux", "text_offset = 0x%012llx\n", + (long long unsigned) lh->text_offset); + grub_dprintf ("linux", "PE/COFF header @ %08x\n", lh->hdr_offset); + + return GRUB_ERR_NONE; +} + +static grub_err_t +finalize_params (void) +{ + grub_efi_boot_services_t *b; + grub_efi_status_t status; + int node, retval; + + get_fdt (); + if (!fdt) + goto failure; + + node = grub_fdt_find_subnode (fdt, 0, "chosen"); + if (node < 0) + node = grub_fdt_add_subnode (fdt, 0, "chosen"); + + if (node < 1) + goto failure; + + /* Set initrd info */ + if (initrd_start && initrd_end > initrd_start) + { + grub_dprintf ("linux", "Initrd @ 0x%012lx-0x%012lx\n", + initrd_start, initrd_end); + + retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-start", + initrd_start); + if (retval) + goto failure; + retval = grub_fdt_set_prop64 (fdt, node, "linux,initrd-end", + initrd_end); + if (retval) + goto failure; + } + + b = grub_efi_system_table->boot_services; + status = b->install_configuration_table (&fdt_guid, fdt); + if (status != GRUB_EFI_SUCCESS) + goto failure; + + grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n", + fdt); + + return GRUB_ERR_NONE; + +failure: + grub_efi_free_pages ((grub_efi_physical_address_t) fdt, + BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt))); + fdt = NULL; + return GRUB_ERR_BAD_OS; +} + +static grub_err_t +grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) +{ + grub_file_t dtb; + void *blob = NULL; + int size; + + if (!loaded) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("you need to load the kernel first")); + return GRUB_ERR_BAD_OS; + } + + if (argc != 1) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + + if (loaded_fdt) + grub_free (loaded_fdt); + loaded_fdt = NULL; + + dtb = grub_file_open (argv[0]); + if (!dtb) + goto out; + + size = grub_file_size (dtb); + blob = grub_malloc (size); + if (!blob) + goto out; + + if (grub_file_read (dtb, blob, size) < size) + { + if (!grub_errno) + grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), argv[0]); + goto out; + } + + if (grub_fdt_check_header (blob, size) != 0) + { + grub_error (GRUB_ERR_BAD_OS, N_("Invalid FDT")); + goto out; + } + +out: + if (dtb) + grub_file_close (dtb); + + if (blob) + { + if (grub_errno == GRUB_ERR_NONE) + loaded_fdt = blob; + else + grub_free (blob); + } + + return grub_errno; +} + +static grub_err_t +grub_linux_boot (void) +{ + grub_efi_memory_mapped_device_path_t *mempath; + grub_efi_handle_t image_handle; + grub_efi_boot_services_t *b; + grub_efi_status_t status; + grub_err_t retval; + grub_efi_loaded_image_t *loaded_image; + grub_efi_char16_t *p16; + char *p8; + + retval = finalize_params(); + if (retval != GRUB_ERR_NONE) + return retval; + + mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t)); + if (!mempath) + return GRUB_ERR_OUT_OF_MEMORY; + + mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE; + mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE; + mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath)); + mempath[0].memory_type = GRUB_EFI_LOADER_DATA; + mempath[0].start_address = (grub_addr_t) kernel_addr; + mempath[0].end_address = (grub_addr_t) kernel_addr + kernel_size; + + mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE; + mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; + mempath[1].header.length = 0; + + b = grub_efi_system_table->boot_services; + status = b->load_image (0, grub_efi_image_handle, + (grub_efi_device_path_t *) mempath, + kernel_addr, kernel_size, &image_handle); + if (status != GRUB_EFI_SUCCESS) + return GRUB_ERR_BAD_OS; + + grub_dprintf ("linux", "linux command line: '%s'\n", linux_args); + + /* Convert command line to UCS-2 */ + loaded_image = grub_efi_get_loaded_image (image_handle); + loaded_image->load_options_size = + grub_strlen (linux_args) * sizeof (grub_efi_char16_t); + loaded_image->load_options = p16 = + grub_efi_allocate_pages (0, + BYTES_TO_PAGES (loaded_image->load_options_size)); + if (!loaded_image->load_options) + return GRUB_ERR_OUT_OF_MEMORY; + + p8 = linux_args; + do + *p16++ = *p8++; + while (*p8); + + grub_dprintf("linux", "starting image %p\n", image_handle); + status = b->start_image (image_handle, 0, NULL); + + /* When successful, not reached */ + return grub_errno; +} + +static grub_err_t +grub_linux_unload (void) +{ + grub_dl_unref (my_mod); + loaded = 0; + if (initrd_start) + grub_efi_free_pages ((grub_efi_physical_address_t) initrd_start, + BYTES_TO_PAGES (initrd_end - initrd_start)); + initrd_start = initrd_end = 0; + grub_free (linux_args); + if (kernel_addr) + grub_efi_free_pages ((grub_efi_physical_address_t) kernel_addr, + BYTES_TO_PAGES (kernel_size)); + if (fdt) + grub_efi_free_pages ((grub_efi_physical_address_t) fdt, + BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt))); + + return GRUB_ERR_NONE; +} + +static grub_err_t +grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) +{ + struct grub_linux_initrd_context initrd_ctx; + int initrd_size, initrd_pages; + void *initrd_mem = NULL; + + if (argc == 0) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + goto fail; + } + + if (!loaded) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("you need to load the kernel first")); + goto fail; + } + + if (grub_initrd_init (argc, argv, &initrd_ctx)) + goto fail; + + initrd_size = grub_get_initrd_size (&initrd_ctx); + grub_dprintf ("linux", "Loading initrd\n"); + + initrd_pages = (BYTES_TO_PAGES (initrd_size)); + initrd_mem = grub_efi_allocate_pages (0, initrd_pages); + if (!initrd_mem) + { + grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate pages"); + goto fail; + } + + if (grub_initrd_load (&initrd_ctx, argv, initrd_mem)) + goto fail; + + initrd_start = (grub_addr_t) initrd_mem; + initrd_end = initrd_start + initrd_size; + grub_dprintf ("linux", "[addr=%p, size=0x%x]\n", + (void *) initrd_start, initrd_size); + + fail: + grub_initrd_close (&initrd_ctx); + if (initrd_mem && !initrd_start) + grub_efi_free_pages ((grub_efi_physical_address_t) initrd_mem, + initrd_pages); + + return grub_errno; +} + +static grub_err_t +grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) +{ + grub_file_t file = 0; + struct linux_kernel_header lh; + + grub_dl_ref (my_mod); + + if (argc == 0) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + goto fail; + } + + file = grub_file_open (argv[0]); + if (!file) + goto fail; + + kernel_size = grub_file_size (file); + + if (grub_file_read (file, &lh, sizeof (lh)) < (long) sizeof (lh)) + return GRUB_ERR_FILE_READ_ERROR; + + if (check_kernel (&lh) != GRUB_ERR_NONE) + goto fail; + + grub_dprintf ("linux", "kernel file size: %lld\n", (long long) kernel_size); + kernel_addr = grub_efi_allocate_pages (0, BYTES_TO_PAGES (kernel_size)); + grub_dprintf ("linux", "kernel numpages: %lld\n", + (long long) BYTES_TO_PAGES (kernel_size)); + if (!kernel_addr) + { + grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel")); + goto fail; + } + + grub_file_seek (file, 0); + if (grub_file_read (file, kernel_addr, kernel_size) + < (grub_int64_t) kernel_size) + { + if (!grub_errno) + grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), argv[0]); + goto fail; + } + + grub_dprintf ("linux", "kernel @ %p\n", kernel_addr); + + cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE); + linux_args = grub_malloc (cmdline_size); + if (!linux_args) + grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate command line"); + grub_memcpy (linux_args, LINUX_IMAGE, sizeof (LINUX_IMAGE)); + grub_create_loader_cmdline (argc, argv, + linux_args + sizeof (LINUX_IMAGE) - 1, + cmdline_size); + + if (grub_errno == GRUB_ERR_NONE) + { + grub_loader_set (grub_linux_boot, grub_linux_unload, 0); + loaded = 1; + } + +fail: + if (file) + grub_file_close (file); + + if (grub_errno != GRUB_ERR_NONE) + { + grub_dl_unref (my_mod); + loaded = 0; + } + + if (linux_args && !loaded) + grub_free (linux_args); + + if (kernel_addr && !loaded) + grub_efi_free_pages ((grub_efi_physical_address_t) kernel_addr, + BYTES_TO_PAGES (kernel_size)); + + return grub_errno; +} + + +static grub_command_t cmd_linux, cmd_initrd, cmd_devicetree; + +GRUB_MOD_INIT (linux) +{ + cmd_linux = grub_register_command ("linux", grub_cmd_linux, 0, + N_("Load Linux.")); + cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, 0, + N_("Load initrd.")); + cmd_devicetree = + grub_register_command ("devicetree", grub_cmd_devicetree, 0, + N_("Load DTB file.")); + my_mod = mod; +} + +GRUB_MOD_FINI (linux) +{ + grub_unregister_command (cmd_linux); + grub_unregister_command (cmd_initrd); + grub_unregister_command (cmd_devicetree); +} diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h new file mode 100644 index 0000000..53e60c6 --- /dev/null +++ b/include/grub/arm64/linux.h @@ -0,0 +1,54 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2013 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#ifndef GRUB_LINUX_CPU_HEADER +#define GRUB_LINUX_CPU_HEADER 1 + +#include + +#define GRUB_EFI_KERNEL_STUB_ENTRY_OFFSET 0 +#define GRUB_LINUX_MAX_LOAD_ADDR 0xffffffffffffULL + +#define GRUB_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ + +/* From linux/Documentation/arm64/booting.txt */ +struct linux_kernel_header +{ + grub_uint32_t code0; /* Executable code */ + grub_uint32_t code1; /* Executable code */ + grub_uint64_t text_offset; /* Image load offset */ + grub_uint64_t res0; /* reserved */ + grub_uint64_t res1; /* reserved */ + grub_uint64_t res2; /* reserved */ + grub_uint64_t res3; /* reserved */ + grub_uint64_t res4; /* reserved */ + grub_uint32_t magic; /* Magic number, little endian, "ARM\x64" */ + grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ +}; + +#define grub_linux_get_params() NULL +extern grub_err_t grub_linux_init_params (void); +extern grub_err_t grub_linux_finalize_params (void); +extern grub_err_t grub_linux_register_kernel (struct linux_kernel_header *lh); +extern grub_err_t grub_linux_register_cmdline (void * addr); +extern grub_err_t grub_linux_register_initrd (void * addr, grub_size_t size); + +extern void grub_efi_linux_arch_register_commands (void); +extern void grub_efi_linux_arch_unregister_commands (void); + +#endif /* ! GRUB_LINUX_CPU_HEADER */ diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h index 5ebdd9f..a0dfec7 100644 --- a/include/grub/efi/api.h +++ b/include/grub/efi/api.h @@ -276,6 +276,10 @@ { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \ } +#define GRUB_EFI_DEVICE_TREE_GUID \ + { 0xb1b621d5, 0xf19c, 0x41a5, \ + { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \ + } struct grub_efi_sal_system_table { grub_uint32_t signature;