Date: Thu, 27 Mar 2014 21:19:06 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263840 - projects/uefi/sys/boot/amd64/efi Message-ID: <201403272119.s2RLJ6g8085332@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Thu Mar 27 21:19:05 2014 New Revision: 263840 URL: http://svnweb.freebsd.org/changeset/base/263840 Log: Update for EFI header changes Sponsored by: The FreeBSD Foundation Modified: projects/uefi/sys/boot/amd64/efi/bootinfo.c projects/uefi/sys/boot/amd64/efi/framebuffer.c Modified: projects/uefi/sys/boot/amd64/efi/bootinfo.c ============================================================================== --- projects/uefi/sys/boot/amd64/efi/bootinfo.c Thu Mar 27 20:46:46 2014 (r263839) +++ projects/uefi/sys/boot/amd64/efi/bootinfo.c Thu Mar 27 21:19:05 2014 (r263840) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include <sys/linker.h> #include <sys/boot.h> #include <machine/cpufunc.h> -#include <machine/efi.h> #include <machine/metadata.h> #include <machine/psl.h> #include <machine/specialreg.h> @@ -222,13 +221,13 @@ bi_load_efi_data(struct preloaded_file * size_t efisz; UINTN mmsz, pages, sz; UINT32 mmver; - struct efi_header *efihdr; + struct efi_map_header *efihdr; struct efi_fb efifb; if (efi_find_framebuffer(&efifb) == 0) file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); - efisz = (sizeof(struct efi_header) + 0xf) & ~0xf; + efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf; /* * Allocate enough pages to hold the bootinfo block and the memory @@ -257,7 +256,7 @@ bi_load_efi_data(struct preloaded_file * * memory map on a 16-byte boundary (the bootinfo block is page * aligned). */ - efihdr = (struct efi_header *)addr; + efihdr = (struct efi_map_header *)addr; mm = (void *)((uint8_t *)efihdr + efisz); sz = (EFI_PAGE_SIZE * pages) - efisz; status = BS->GetMemoryMap(&sz, mm, &x86_efi_mapkey, &mmsz, &mmver); Modified: projects/uefi/sys/boot/amd64/efi/framebuffer.c ============================================================================== --- projects/uefi/sys/boot/amd64/efi/framebuffer.c Thu Mar 27 20:46:46 2014 (r263839) +++ projects/uefi/sys/boot/amd64/efi/framebuffer.c Thu Mar 27 21:19:05 2014 (r263840) @@ -33,8 +33,7 @@ __FBSDID("$FreeBSD$"); #include <efi.h> #include <efilib.h> - -#include <machine/efi.h> +#include <machine/metadata.h> static EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403272119.s2RLJ6g8085332>