svn commit: r262379 - projects/arm64/sys/boot/arm64/efi

[Andrew Turner]

Author: andrew
Date: Sun Feb 23 18:45:04 2014
New Revision: 262379
URL: http://svnweb.freebsd.org/changeset/base/262379

Log:
  Round the address we load the kernel to to be 2MiB aligned

Modified:
  projects/arm64/sys/boot/arm64/efi/copy.c

Modified: projects/arm64/sys/boot/arm64/efi/copy.c
==============================================================================
--- projects/arm64/sys/boot/arm64/efi/copy.c	Sun Feb 23 18:44:10 2014	(r262378)
+++ projects/arm64/sys/boot/arm64/efi/copy.c	Sun Feb 23 18:45:04 2014	(r262379)
@@ -56,6 +56,9 @@ arm64_efi_copy_init(void)
 		    status & EFI_ERROR_MASK);
 		return (status);
 	}
+	/* Round the kernel load address to a 2MiB value */
+	staging = roundup2(staging, 2 * 1024 * 1024);
+
 
 	return (0);
 }
@@ -92,6 +95,6 @@ ssize_t
 arm64_efi_readin(const int fd, vm_offset_t dest, const size_t len)
 {
 
-	return (read(fd, (void *)(dest + stage_offset), len));
+	return (read(fd, arm64_efi_translate(dest), len));
 }