svn commit: r295313 - user/ngie/stable-10-libnv/sys/boot/ia64/efi

[Garrett Cooper]

Author: ngie
Date: Fri Feb  5 08:41:27 2016
New Revision: 295313
URL: https://svnweb.freebsd.org/changeset/base/295313

Log:
  On second thought, don't bother half-implementing ZFS EFI support
  since ia64 is a dead-end platform. Just do the bare minimum to fix
  the efi_handle_lookup(..) call

Modified:
  user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
  user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c

Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile	Fri Feb  5 08:34:27 2016	(r295312)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile	Fri Feb  5 08:41:27 2016	(r295313)
@@ -8,21 +8,7 @@ MK_SSP=		no
 PROG=		loader.sym
 INTERNALPROG=
 
-.if ${MK_ZFS} != "no"
-# Disable warnings that are currently incompatible with the zfs boot code
-CWARNFLAGS.zfs_module.c += -Wno-array-bounds
-CWARNFLAGS.zfs_module.c += -Wno-cast-align
-CWARNFLAGS.zfs_module.c += -Wno-cast-qual
-CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes
-CWARNFLAGS.zfs_module.c += -Wno-sign-compare
-CWARNFLAGS.zfs_module.c += -Wno-unused-parameter
-CWARNFLAGS.zfs_module.c += -Wno-unused-function
-.endif
-
 SRCS=		conf.c efimd.c main.c pal.S start.S vers.c
-.if ${MK_ZFS} != "no"
-SRCS+=		zfs_module.c
-.endif
 
 .PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} ${.CURDIR}/../../efi/boot1
 
@@ -33,12 +19,6 @@ CFLAGS+=	-I${.CURDIR}/../../efi/include/
 CFLAGS+=	-I${.CURDIR}/../../..
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
 
-.if ${MK_ZFS} != "no"
-CFLAGS+=	-I${.CURDIR}/../../zfs/
-CFLAGS+=	-I${.CURDIR}/../../../cddl/boot/zfs/
-CFLAGS+=	-DEFI_ZFS_BOOT
-.endif
-
 LDSCRIPT=	${.CURDIR}/ldscript.${MACHINE_CPUARCH}
 LDFLAGS=	-Wl,-T${LDSCRIPT} -shared -symbolic
 

Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c	Fri Feb  5 08:34:27 2016	(r295312)
+++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/main.c	Fri Feb  5 08:41:27 2016	(r295313)
@@ -144,7 +144,6 @@ main(int argc, CHAR16 *argv[])
 	EFI_LOADED_IMAGE *img;
 	char *dev;
 	int i;
-	uint64_t pool_guid;
 
 	/* 
 	 * XXX Chicken-and-egg problem; we want to have console output
@@ -180,27 +179,9 @@ main(int argc, CHAR16 *argv[])
 	BS->HandleProtocol(IH, &imgid, (VOID**)&img);
 
 	bzero(&currdev, sizeof(currdev));
-	if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, &pool_guid) != 0)
+	if (efi_handle_lookup(img->DeviceHandle, &dev, &unit, NULL) != 0)
 		return (EFI_NOT_FOUND);
-	switch (dev->dv_type) {
-#ifdef EFI_ZFS_BOOT
-	case DEVT_ZFS: {
-		struct zfs_devdesc currdev;
-
-		currdev.d_dev = dev;
-		currdev.d_unit = unit;
-		currdev.d_type = currdev.d_dev->dv_type;
-		currdev.d_opendata = NULL;
-		currdev.pool_guid = pool_guid;
-		currdev.root_guid = 0;
-		env_setenv("currdev", EV_VOLATILE, efi_fmtdev(&currdev),
-			   efi_setcurrdev, env_nounset);
-		env_setenv("loaddev", EV_VOLATILE, efi_fmtdev(&currdev), env_noset,
-			   env_nounset);
-		break;
-	}
-#endif
-	default: {
+	{
 		struct devdesc currdev;
 
 		dev = get_dev_option(argc, argv);
@@ -217,7 +198,6 @@ main(int argc, CHAR16 *argv[])
 			   env_nounset);
 		break;
 	}
-	}
 
 	env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);