Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 26 Feb 2019 03:37:13 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r344560 - head/stand/efi/loader/arch/i386
Message-ID:  <201902260337.x1Q3bDcw014277@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kevans
Date: Tue Feb 26 03:37:12 2019
New Revision: 344560
URL: https://svnweb.freebsd.org/changeset/base/344560

Log:
  stand: Remove unused i386 EFI MD bits
  
  r328169 removed the copy of bootinfo that would've made this somewhat
  functional. However, this is irrelevant- earlier work in r292338 was done to
  exit boot services in the MI bi_load() rather than having N copies of the
  GetMemoryMap/ExitBootServices dance.
  
  i386 never quite caught up to that; ldr_enter was still being called but
  the prereq for that, ldr_bootinfo, was no longer. As a consequence, this
  ExitBootServices() was being called with a mapkey=0, clearly bogus, and
  reportedly breaking the boot in some instances.
  
  Reported by:	bcran
  MFC after:	1 week

Deleted:
  head/stand/efi/loader/arch/i386/efimd.c
Modified:
  head/stand/efi/loader/arch/i386/Makefile.inc
  head/stand/efi/loader/arch/i386/elf32_freebsd.c

Modified: head/stand/efi/loader/arch/i386/Makefile.inc
==============================================================================
--- head/stand/efi/loader/arch/i386/Makefile.inc	Tue Feb 26 03:34:47 2019	(r344559)
+++ head/stand/efi/loader/arch/i386/Makefile.inc	Tue Feb 26 03:37:12 2019	(r344560)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 SRCS+=	start.S \
-	efimd.c \
 	elf32_freebsd.c \
 	exec.c
 

Modified: head/stand/efi/loader/arch/i386/elf32_freebsd.c
==============================================================================
--- head/stand/efi/loader/arch/i386/elf32_freebsd.c	Tue Feb 26 03:34:47 2019	(r344559)
+++ head/stand/efi/loader/arch/i386/elf32_freebsd.c	Tue Feb 26 03:37:12 2019	(r344560)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 
 extern void __exec(caddr_t addr, ...);
 extern int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp);
-extern int ldr_enter(const char *kernel);
 
 static int	elf32_exec(struct preloaded_file *amp);
 static int	elf32_obj_exec(struct preloaded_file *amp);
@@ -84,8 +83,6 @@ elf32_exec(struct preloaded_file *fp)
     entry = ehdr->e_entry & 0xffffff;
 
     printf("Start @ 0x%x ...\n", entry);
-
-    ldr_enter(fp->f_name);
 
     dev_cleanup();
     __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, kernend);

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