From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aaG0z-0008MF-EC for mharc-grub-devel@gnu.org; Mon, 29 Feb 2016 00:05:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaAfY-000168-C5 for grub-devel@gnu.org; Sun, 28 Feb 2016 18:22:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaAfT-0005P0-I1 for grub-devel@gnu.org; Sun, 28 Feb 2016 18:22:32 -0500 Received: from mx2.suse.de ([195.135.220.15]:48938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaAfT-0005OY-Bs for grub-devel@gnu.org; Sun, 28 Feb 2016 18:22:27 -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 8BA93ABD3; Sun, 28 Feb 2016 23:22:24 +0000 (UTC) From: Alexander Graf To: grub-devel@gnu.org Subject: [PATCH 2/2] arm efi: Use fdt from firmware when available Date: Mon, 29 Feb 2016 00:22:24 +0100 Message-Id: <1456701744-202295-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1456701744-202295-1-git-send-email-agraf@suse.de> References: <1456701744-202295-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-Mailman-Approved-At: Mon, 29 Feb 2016 00:05:00 -0500 Cc: leif.lindholm@linaro.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2016 23:22:33 -0000 If EFI is nice enough to pass us an FDT using configuration tables on 32bit ARM, we should really try and make use of it. Signed-off-by: Alexander Graf --- include/grub/arm/linux.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h index 059dbba..a66caad 100644 --- a/include/grub/arm/linux.h +++ b/include/grub/arm/linux.h @@ -40,11 +40,7 @@ # define LINUX_PHYS_OFFSET (0x00008000) # define LINUX_INITRD_PHYS_OFFSET (LINUX_PHYS_OFFSET + 0x02000000) # define LINUX_FDT_PHYS_OFFSET (LINUX_INITRD_PHYS_OFFSET - 0x10000) -static inline grub_addr_t -grub_arm_firmware_get_boot_data (void) -{ - return 0; -} +# define grub_arm_firmware_get_boot_data (grub_addr_t)grub_efi_get_firmware_fdt static inline grub_uint32_t grub_arm_firmware_get_machine_type (void) { -- 1.8.5.6