svn commit: r263825 - projects/uefi/sys/boot/amd64/efi

[Ed Maste]

Author: emaste
Date: Thu Mar 27 19:16:28 2014
New Revision: 263825
URL: http://svnweb.freebsd.org/changeset/base/263825

Log:
  Merge r263005 from head
  
  SVN did not automatically track the move from boot/i386/efi to
  boot/amd64/efi.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/uefi/sys/boot/amd64/efi/bootinfo.c

Modified: projects/uefi/sys/boot/amd64/efi/bootinfo.c
==============================================================================
--- projects/uefi/sys/boot/amd64/efi/bootinfo.c	Thu Mar 27 19:06:33 2014	(r263824)
+++ projects/uefi/sys/boot/amd64/efi/bootinfo.c	Thu Mar 27 19:16:28 2014	(r263825)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/linker.h>
+#include <sys/boot.h>
 #include <machine/cpufunc.h>
 #include <machine/efi.h>
 #include <machine/metadata.h>
@@ -48,29 +49,6 @@ __FBSDID("$FreeBSD$");
 
 UINTN x86_efi_mapkey;
 
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct 
-{
-	const char	*ev;
-	int		mask;
-} howto_names[] = {
-	{ "boot_askname",	RB_ASKNAME},
-	{ "boot_cdrom",		RB_CDROM},
-	{ "boot_ddb",		RB_KDB},
-	{ "boot_dfltroot",	RB_DFLTROOT},
-	{ "boot_gdb",		RB_GDB},
-	{ "boot_multicons",	RB_MULTIPLE},
-	{ "boot_mute",		RB_MUTE},
-	{ "boot_pause",		RB_PAUSE},
-	{ "boot_serial",	RB_SERIAL},
-	{ "boot_single",	RB_SINGLE},
-	{ "boot_verbose",	RB_VERBOSE},
-	{ NULL,	0}
-};
-
 static const char howto_switches[] = "aCdrgDmphsv";
 static int howto_masks[] = {
 	RB_ASKNAME, RB_CDROM, RB_KDB, RB_DFLTROOT, RB_GDB, RB_MULTIPLE,