From owner-svn-src-all@freebsd.org Tue Feb 13 04:28:14 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A233AF1E660; Tue, 13 Feb 2018 04:28:14 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4AEE182BE7; Tue, 13 Feb 2018 04:28:14 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AD1B1BE0D; Tue, 13 Feb 2018 04:28:14 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1D4SELD001617; Tue, 13 Feb 2018 04:28:14 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1D4SDMm001614; Tue, 13 Feb 2018 04:28:13 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802130428.w1D4SDMm001614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 13 Feb 2018 04:28:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r329192 - in stable/11/stand: efi/loader i386/zfsboot powerpc/ofw X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11/stand: efi/loader i386/zfsboot powerpc/ofw X-SVN-Commit-Revision: 329192 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Feb 2018 04:28:15 -0000 Author: kevans Date: Tue Feb 13 04:28:13 2018 New Revision: 329192 URL: https://svnweb.freebsd.org/changeset/base/329192 Log: stand: Clean up some unintentional inconsistencies This is a direct commit to stable/11 to address the following final unintended inconsistencies between stable/11 and head: - Some unused LIBSTAND= cruft left in efi/loader/Makefie - A comment that flew in with unrelated changes - An #include that may go away now that stand is basically self-contained Modified: stable/11/stand/efi/loader/Makefile stable/11/stand/i386/zfsboot/zfsldr.S stable/11/stand/powerpc/ofw/ofwfdt.c Modified: stable/11/stand/efi/loader/Makefile ============================================================================== --- stable/11/stand/efi/loader/Makefile Tue Feb 13 04:10:10 2018 (r329191) +++ stable/11/stand/efi/loader/Makefile Tue Feb 13 04:28:13 2018 (r329192) @@ -54,12 +54,6 @@ CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include CFLAGS+= -I${BOOTSRC}/i386/libi386 CFLAGS+= -DNO_PCI -DEFI -# make buildenv doesn't set DESTDIR, this means LIBSTAND -# will be wrong when crossbuilding. -.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) -LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a -.endif - .if !defined(BOOT_HIDE_SERIAL_NUMBERS) # Export serial numbers, UUID, and asset tag from loader. CFLAGS+= -DSMBIOS_SERIAL_NUMBERS Modified: stable/11/stand/i386/zfsboot/zfsldr.S ============================================================================== --- stable/11/stand/i386/zfsboot/zfsldr.S Tue Feb 13 04:10:10 2018 (r329191) +++ stable/11/stand/i386/zfsboot/zfsldr.S Tue Feb 13 04:28:13 2018 (r329192) @@ -33,7 +33,7 @@ .set SIZ_PAG,0x1000 # Page size .set SIZ_SEC,0x200 # Sector size .set COPY_BLKS,0x8 # Number of blocks - # to copy for boot2 + # to copy for boot2 (<= 15) .set COPY_BLK_SZ,0x8000 # Copy in 32k blocks; must be # a multiple of 16 bytes .set NSECT,(COPY_BLK_SZ / SIZ_SEC * COPY_BLKS) Modified: stable/11/stand/powerpc/ofw/ofwfdt.c ============================================================================== --- stable/11/stand/powerpc/ofw/ofwfdt.c Tue Feb 13 04:10:10 2018 (r329191) +++ stable/11/stand/powerpc/ofw/ofwfdt.c Tue Feb 13 04:28:13 2018 (r329192) @@ -26,11 +26,6 @@ #include __FBSDID("$FreeBSD$"); -/* - * Include stdlib.h because of DEBUG_MALLOC shenanigans in stand.h for now. - * This will be removed in the future, when libsa silently replaces stdlib.h. - */ -#include #include #include #include