From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1c7icJ-0002Zp-Ai for mharc-grub-devel@gnu.org; Fri, 18 Nov 2016 07:50:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7icG-0002Wx-5V for grub-devel@gnu.org; Fri, 18 Nov 2016 07:50:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7icD-0007nk-3k for grub-devel@gnu.org; Fri, 18 Nov 2016 07:50:04 -0500 Received: from mx2.suse.de ([195.135.220.15]:41216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c7icC-0007mt-Ll for grub-devel@gnu.org; Fri, 18 Nov 2016 07:50:01 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BABD4ACF2; Fri, 18 Nov 2016 12:49:57 +0000 (UTC) From: Alexander Graf To: dkiper@net-space.pl Cc: grub-devel@gnu.org, arvidjaar@gmail.com, leif.lindholm@linaro.org Subject: [PATCH] efi: Move fdt helper into own file Date: Fri, 18 Nov 2016 13:50:07 +0100 Message-Id: <1479473407-13212-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.8.5.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Nov 2016 12:50:05 -0000 We only support FDT files with EFI on arm and arm64 systems, not on x86. So move the helper that finds a prepopulated FDT UUID into its own file and only build it for architectures where it also gets called. Signed-off-by: Alexander Graf --- grub-core/Makefile.core.def | 2 ++ grub-core/kern/efi/fdt.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ grub-core/kern/efi/init.c | 22 -------------------- include/grub/efi/efi.h | 2 ++ 4 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 grub-core/kern/efi/fdt.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 21ad0dd..2dfa22a 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -212,8 +212,10 @@ kernel = { arm_efi = kern/arm/efi/init.c; arm_efi = kern/arm/efi/misc.c; + arm_efi = kern/efi/fdt.c; arm64_efi = kern/arm64/efi/init.c; + arm64_efi = kern/efi/fdt.c; i386_pc = kern/i386/pc/init.c; i386_pc = kern/i386/pc/mmap.c; diff --git a/grub-core/kern/efi/fdt.c b/grub-core/kern/efi/fdt.c new file mode 100644 index 0000000..74a3669 --- /dev/null +++ b/grub-core/kern/efi/fdt.c @@ -0,0 +1,50 @@ +/* fdt.c - EFI Flattened Device Tree interaction */ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2006,2007 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 + +void * +grub_efi_get_firmware_fdt (void) +{ + grub_efi_configuration_table_t *tables; + grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; + 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 @ %p\n", firmware_fdt); + break; + } + + return firmware_fdt; +} + diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c index fb90ecd..e9c85de 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -72,28 +72,6 @@ grub_machine_get_bootlocation (char **device, char **path) } } -void * -grub_efi_get_firmware_fdt (void) -{ - grub_efi_configuration_table_t *tables; - grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; - 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 @ %p\n", firmware_fdt); - break; - } - - return firmware_fdt; -} - void grub_efi_fini (void) { diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h index 2acf85e..e9c601f 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -81,7 +81,9 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd, char **device, char **path); +#if defined(__arm__) || defined(__aarch64__) void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void); +#endif grub_addr_t grub_efi_modules_addr (void); -- 1.8.5.6