Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 5 Apr 2014 17:29:40 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r264152 - projects/arm64/sys/boot/arm64/efi
Message-ID:  <201404051729.s35HTeW9095413@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: andrew
Date: Sat Apr  5 17:29:40 2014
New Revision: 264152
URL: http://svnweb.freebsd.org/changeset/base/264152

Log:
  Set MODINFOMD_KERNEND correctly. While here remove an unneeded printf and
  fix the style a little.

Modified:
  projects/arm64/sys/boot/arm64/efi/bootinfo.c
  projects/arm64/sys/boot/arm64/efi/exec.c

Modified: projects/arm64/sys/boot/arm64/efi/bootinfo.c
==============================================================================
--- projects/arm64/sys/boot/arm64/efi/bootinfo.c	Sat Apr  5 16:54:47 2014	(r264151)
+++ projects/arm64/sys/boot/arm64/efi/bootinfo.c	Sat Apr  5 17:29:40 2014	(r264152)
@@ -199,14 +199,15 @@ int
 bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp)
 {
 	struct preloaded_file *xp, *kfp;
+	struct file_metadata *md;
 	uint64_t kernend;
 	vm_offset_t addr, size;
 
 	/* find the last module in the chain */
 	addr = 0;
 	for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) {
-	if (addr < (xp->f_addr + xp->f_size))
-		addr = xp->f_addr + xp->f_size;
+		if (addr < (xp->f_addr + xp->f_size))
+			addr = xp->f_addr + xp->f_size;
 	}
 	/* pad to a page boundary */
 	addr = roundup(addr, PAGE_SIZE);
@@ -227,6 +228,9 @@ bi_load(char *args, vm_offset_t *modulep
 	kernend = roundup(addr + size, PAGE_SIZE);
 	*kernendp = kernend;
 
+	md = file_findmetadata(kfp, MODINFOMD_KERNEND);
+	bcopy(&kernend, md->md_data, sizeof kernend);
+
 	/* copy module list and metadata */
 	(void)bi_copymodules(addr);
 

Modified: projects/arm64/sys/boot/arm64/efi/exec.c
==============================================================================
--- projects/arm64/sys/boot/arm64/efi/exec.c	Sat Apr  5 16:54:47 2014	(r264151)
+++ projects/arm64/sys/boot/arm64/efi/exec.c	Sat Apr  5 17:29:40 2014	(r264152)
@@ -79,8 +79,6 @@ elf64_exec(struct preloaded_file *fp)
 	if (err != 0)
 		return (err);
 
-	printf("%llx %llx\n", modulep, kernendp);
-
 	status = BS->ExitBootServices(IH, arm64_efi_mapkey);
         if (EFI_ERROR(status)) {
 		printf("%s: ExitBootServices() returned 0x%lx\n", __func__,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404051729.s35HTeW9095413>