From owner-svn-src-user@freebsd.org Fri Feb 5 08:41:28 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5E11A47540 for ; Fri, 5 Feb 2016 08:41:28 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1C711A57; Fri, 5 Feb 2016 08:41:28 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u158fRDL030564; Fri, 5 Feb 2016 08:41:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u158fRH2030562; Fri, 5 Feb 2016 08:41:27 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201602050841.u158fRH2030562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 5 Feb 2016 08:41:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r295313 - user/ngie/stable-10-libnv/sys/boot/ia64/efi X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2016 08:41:29 -0000 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);