From owner-svn-src-head@freebsd.org Mon Oct 16 04:04:16 2017 Return-Path: Delivered-To: svn-src-head@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 0F72BE2D2D4 for ; Mon, 16 Oct 2017 04:04:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22f.google.com (mail-it0-x22f.google.com [IPv6:2607:f8b0:4001:c0b::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C3E8F6B8D2 for ; Mon, 16 Oct 2017 04:04:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22f.google.com with SMTP id n195so16570945itg.2 for ; Sun, 15 Oct 2017 21:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=CwVzf916yABM2FklIBt1MVfaq7V5Xu3CtMQfwa4wWp4=; b=tg0j6FLLa77GudetEr6X3f60Vsas1Fy61nQ8qxjecdIkQkrJhnpWcDS/P5tcAUhS/h TOd3v773NPy90oV58e0wqOpAOV2gGjNqeQLS9yITpoCIJfkER/hDurI3nPdqSVVFygCx iNe+CNfLXTdjfe7+nST10Dfx8CfTTf3X5a9Gg6kvekAbRCTsEwszpQMm3d1X2biLnv1A 6EkJHT1nSArzSmFSuRWBWSxqRc8a8lARWml49CreL0QexSxY/i1oMI18PL5eSnBiw1IH fAKVYHBLqTqHOoFQC0331PZjrPAVV/JRX83owMA4fi/o+Ew7of97Y0puvw7AWKDdkFbG bXiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=CwVzf916yABM2FklIBt1MVfaq7V5Xu3CtMQfwa4wWp4=; b=gASEw4Anz0Ok/u4Ea4OZVVkBMb4kKmLNx/rkU7Opdb2yCszssNg+/XfU/Q8rkp5Ymy JQEaJAbpS1zfnEFeK3dFS+Z02Gj9GpeqTouz0ROZu9y9eJjx04K5Q3b31U72nuYjd7gy tZCPWzkR2JUdmpf7DWOZLbHtFo0+MzrJCempcWFOXvCd7ZPeRdw+wN7mWTQYtf2v723o ROM9lRZ+9XKxJ92O0Re4VS/x/gnw2y+2hVMYr9VLPD5C18iZURpxE07XlWp32SmzuKgE SnDdl036JdJEEX6tJ61cjb2lFBQE6XMSEhuQI3MIbdLIamFEvCkPiTJHZz7HQNesk+3V U6fg== X-Gm-Message-State: AMCzsaU8lGxbWreZDol+7Un6G4mL2YFxdomBmVx/8CZBvvJ4fhYttm72 75WcP/74CqSZ2fOwrM2mlGaqw/4cXY0NQ6W2vWseTQ== X-Google-Smtp-Source: AOwi7QCAKQ1jn3cV1fghPtGU7RfsmjQEenp++z8+PxLi9hTxIwphIlb6BoBOufswUEBiv+1crCbTR9LkPdFYlM9+g8o= X-Received: by 10.36.118.81 with SMTP id z78mr10311103itb.97.1508126654647; Sun, 15 Oct 2017 21:04:14 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.94.130 with HTTP; Sun, 15 Oct 2017 21:04:14 -0700 (PDT) X-Originating-IP: [50.253.99.174] In-Reply-To: <201710160359.v9G3xq1f087985@repo.freebsd.org> References: <201710160359.v9G3xq1f087985@repo.freebsd.org> From: Warner Losh Date: Sun, 15 Oct 2017 22:04:14 -0600 X-Google-Sender-Auth: 1VpQY25DHAzL9mJYbEmdwvz9l08 Message-ID: Subject: Re: svn commit: r324653 - in head/sys/boot: . arm/uboot efi/libefi efi/loader i386/libi386 i386/loader i386/zfsboot mips/beri/loader mips/uboot powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot sparc... To: Warner Losh Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Oct 2017 04:04:16 -0000 On Sun, Oct 15, 2017 at 9:59 PM, Warner Losh wrote: > Author: imp > Date: Mon Oct 16 03:59:52 2017 > New Revision: 324653 > URL: https://svnweb.freebsd.org/changeset/base/324653 > > Log: > LOADER_foo_SUPPORTED > Urrrgggg.. I forgot to change this to the real commit message.... Should I revert and recommit? " Move the LOADER_foo_SUPPORTED into a common location. Sponsored by: Netflix " seems to be only marginally better and not worth the hassle. But I'm open to differing views. Warner > Modified: > head/sys/boot/arm/uboot/Makefile > head/sys/boot/defs.mk > head/sys/boot/efi/libefi/Makefile > head/sys/boot/efi/loader/Makefile > head/sys/boot/i386/libi386/Makefile > head/sys/boot/i386/loader/Makefile > head/sys/boot/i386/zfsboot/Makefile > head/sys/boot/loader.mk > head/sys/boot/mips/beri/loader/Makefile > head/sys/boot/mips/uboot/Makefile > head/sys/boot/powerpc/kboot/Makefile > head/sys/boot/powerpc/ofw/Makefile > head/sys/boot/powerpc/ps3/Makefile > head/sys/boot/powerpc/uboot/Makefile > head/sys/boot/sparc64/loader/Makefile > head/sys/boot/uboot/lib/Makefile > head/sys/boot/userboot/userboot/Makefile > > Modified: head/sys/boot/arm/uboot/Makefile > ============================================================ > ================== > --- head/sys/boot/arm/uboot/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/arm/uboot/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -19,60 +19,17 @@ SRCS= start.S conf.c self_reloc.c vers.c > CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitialized > .endif > > -.if !defined(LOADER_NO_DISK_SUPPORT) > -LOADER_DISK_SUPPORT?= yes > -.else > -LOADER_DISK_SUPPORT= no > -.endif > LOADER_UFS_SUPPORT?= yes > LOADER_CD9660_SUPPORT?= no > +LOADER_MSDOS_SUPPORT?= no > LOADER_EXT2FS_SUPPORT?= no > -.if ${MK_NAND} != "no" > -LOADER_NANDFS_SUPPORT?= yes > -.else > -LOADER_NANDFS_SUPPORT?= no > -.endif > LOADER_NET_SUPPORT?= yes > LOADER_NFS_SUPPORT?= yes > LOADER_TFTP_SUPPORT?= no > LOADER_GZIP_SUPPORT?= no > LOADER_BZIP2_SUPPORT?= no > -.if ${MK_FDT} != "no" > -LOADER_FDT_SUPPORT= yes > -.else > -LOADER_FDT_SUPPORT= no > -.endif > +LOADER_FDT_SUPPORT= ${MK_FDT} > > -.if ${LOADER_DISK_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > -.if ${LOADER_UFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_UFS_SUPPORT > -.endif > -.if ${LOADER_CD9660_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_CD9660_SUPPORT > -.endif > -.if ${LOADER_EXT2FS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_EXT2FS_SUPPORT > -.endif > -.if ${LOADER_NANDFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NANDFS_SUPPORT > -.endif > -.if ${LOADER_GZIP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if ${LOADER_BZIP2_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if ${LOADER_NET_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NET_SUPPORT > -.endif > -.if ${LOADER_NFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > -.if ${LOADER_TFTP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > .if ${LOADER_FDT_SUPPORT} == "yes" > CFLAGS+= -I${.CURDIR}/../../fdt > CFLAGS+= -I${.OBJDIR}/../../fdt > > Modified: head/sys/boot/defs.mk > ============================================================ > ================== > --- head/sys/boot/defs.mk Mon Oct 16 03:59:44 2017 (r324652) > +++ head/sys/boot/defs.mk Mon Oct 16 03:59:52 2017 (r324653) > @@ -19,4 +19,56 @@ LIBFICL32= ${OBJTOP}/sys/boot/ficl32/libficl.a > LIBSA= ${OBJTOP}/sys/boot/libsa/libsa.a > LIBSA32= ${OBJTOP}/sys/boot/libsa32/libsa32.a > > +# Standard options: > + > +# Filesystem support > +.if ${LOADER_CD9660_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_CD9660_SUPPORT > +.endif > +.if ${LOADER_EXT2FS_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_EXT2FS_SUPPORT > +.endif > +.if ${LOADER_MSDOS_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_MSDOS_SUPPORT > +.endif > +.if ${LOADER_NANDFS_SUPPORT:U${MK_NAND}} == "yes" > +CFLAGS+= -DLOADER_NANDFS_SUPPORT > +.endif > +.if ${LOADER_UFS_SUPPORT:Uyes} == "yes" > +CFLAGS+= -DLOADER_UFS_SUPPORT > +.endif > + > +# Compression > +.if ${LOADER_GZIP_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_GZIP_SUPPORT > +.endif > +.if ${LOADER_BZIP2_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_BZIP2_SUPPORT > +.endif > + > +# Network related things > +.if ${LOADER_NET_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_NET_SUPPORT > +.endif > +.if ${LOADER_NFS_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_NFS_SUPPORT > +.endif > +.if ${LOADER_TFTP_SUPPORT:Uno} == "yes" > +CFLAGS+= -DLOADER_TFTP_SUPPORT > +.endif > + > +# Disk and partition support > +.if ${LOADER_DISK_SUPPORT:Uyes} == "yes" > +CFLAGS+= -DLOADER_DISK_SUPPORT > +.if ${LOADER_GPT_SUPPORT:Uyes} == "yes" > +CFLAGS+= -DLOADER_GPT_SUPPORT > +.endif > +.if ${LOADER_MBR_SUPPORT:Uyes} == "yes" > +CFLAGS+= -DLOADER_MBR_SUPPORT > +.endif > +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" > +CFLAGS+= -DLOADER_GELI_SUPPORT > +.endif > +.endif > + > .endif # __BOOT_DEFS_MK__ > > Modified: head/sys/boot/efi/libefi/Makefile > ============================================================ > ================== > --- head/sys/boot/efi/libefi/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/efi/libefi/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -35,6 +35,7 @@ CFLAGS+= -mgeneral-regs-only > .if ${MACHINE_ARCH} == "amd64" > CFLAGS+= -fPIC -mno-red-zone > .endif > +CFLAGS+= -I${SYSDIR} > CFLAGS+= -I${.CURDIR}/../include > CFLAGS+= -I${.CURDIR}/../include/${MACHINE} > .if ${MK_ZFS} != "no" > > Modified: head/sys/boot/efi/loader/Makefile > ============================================================ > ================== > --- head/sys/boot/efi/loader/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/efi/loader/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -11,6 +11,11 @@ INTERNALPROG= > WARNS?= 3 > LOADER_NET_SUPPORT?= yes > > +LOADER_MSDOS_SUPPORT?= yes > +LOADER_UFS_SUPPORT?= yes > +LOADER_CD9660_SUPPORT?= no > +LOADER_EXT2FS_SUPPORT?= no > + > # architecture-specific loader code > SRCS= autoload.c \ > bootinfo.c \ > > Modified: head/sys/boot/i386/libi386/Makefile > ============================================================ > ================== > --- head/sys/boot/i386/libi386/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/i386/libi386/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -1,5 +1,7 @@ > # $FreeBSD$ > # > +.include "../../defs.mk" > + > LIB= i386 > INTERNALLIB= > > @@ -11,13 +13,6 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c > biospnp > smbios.c time.c vidconsole.c amd64_tramp.S spinconsole.c > .PATH: ${.CURDIR}/../../zfs > SRCS+= devicename_stubs.c > - > -.if defined(LOADER_TFTP_SUPPORT) > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > -.if defined(LOADER_NFS_SUPPORT) > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > > BOOT_COMCONSOLE_PORT?= 0x3f8 > CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} > > Modified: head/sys/boot/i386/loader/Makefile > ============================================================ > ================== > --- head/sys/boot/i386/loader/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/i386/loader/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -13,6 +13,11 @@ LOADER_NET_SUPPORT?= yes > LOADER_NFS_SUPPORT?= yes > LOADER_TFTP_SUPPORT?= yes > > +LOADER_CD9660_SUPPORT?= no > +LOADER_EXT2FS_SUPPORT?= no > +LOADER_MSDOS_SUPPORT?= no > +LOADER_UFS_SUPPORT?= yes > + > # architecture-specific loader code > SRCS= main.c conf.c vers.c chain.c > > @@ -28,13 +33,6 @@ CFLAGS+= -DLOADER_ZFS_SUPPORT > LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a > .endif > > -.if defined(LOADER_TFTP_SUPPORT) > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > -.if defined(LOADER_NFS_SUPPORT) > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > - > # Include bcache code. > HAVE_BCACHE= yes > > @@ -42,16 +40,7 @@ HAVE_BCACHE= yes > HAVE_PNP= yes > HAVE_ISABUS= yes > > -.if defined(LOADER_BZIP2_SUPPORT) > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if !defined(LOADER_NO_GZIP_SUPPORT) > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if defined(LOADER_NANDFS_SUPPORT) > -CFLAGS+= -DLOADER_NANDFS_SUPPORT > -.endif > -.if !defined(LOADER_NO_GELI_SUPPORT) > +.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" > CFLAGS+= -DLOADER_GELI_SUPPORT > CFLAGS+= -I${.CURDIR}/../../geli > LIBGELIBOOT= ${.OBJDIR}/../../geli/libgeliboot.a > > Modified: head/sys/boot/i386/zfsboot/Makefile > ============================================================ > ================== > --- head/sys/boot/i386/zfsboot/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/i386/zfsboot/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -1,5 +1,7 @@ > # $FreeBSD$ > > +LOADER_GELI_SUPPORT=no > + > .include "../Makefile.inc" > > .PATH: ${.CURDIR}/../boot2 ${.CURDIR}/../common \ > > Modified: head/sys/boot/loader.mk > ============================================================ > ================== > --- head/sys/boot/loader.mk Mon Oct 16 03:59:44 2017 (r324652) > +++ head/sys/boot/loader.mk Mon Oct 16 03:59:52 2017 (r324653) > @@ -28,22 +28,12 @@ SRCS+= load_elf64.c reloc_elf64.c > SRCS+= load_elf32.c reloc_elf32.c > .endif > > -.if defined(LOADER_NET_SUPPORT) > -SRCS+= dev_net.c > -.endif > - > -.if !defined(LOADER_NO_DISK_SUPPORT) > +.if ${LOADER_DISK_SUPPORT:Uyes} == "yes" > SRCS+= disk.c part.c > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.if !defined(LOADER_NO_GPT_SUPPORT) > -CFLAGS+= -DLOADER_GPT_SUPPORT > .endif > -.if !defined(LOADER_NO_MBR_SUPPORT) > -CFLAGS+= -DLOADER_MBR_SUPPORT > -.endif > -.endif > -.if !defined(LOADER_NO_GELI_SUPPORT) > -CFLAGS+= -DLOADER_GELI_SUPPORT > + > +.if ${LOADER_NET_SUPPORT:Uno} == "yes" > +SRCS+= dev_net.c > .endif > > .if defined(HAVE_BCACHE) > > Modified: head/sys/boot/mips/beri/loader/Makefile > ============================================================ > ================== > --- head/sys/boot/mips/beri/loader/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/mips/beri/loader/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -59,14 +59,12 @@ SRCS+= altera_jtag_uart.c > \ > # Since we don't have a backward compatibility issue, default to this on > BERI. > CFLAGS+= -DBOOT_PROMPT_123 > > -CFLAGS+= -DLOADER_DISK_SUPPORT > -CFLAGS+= -DLOADER_UFS_SUPPORT > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > - > -#CFLAGS+= -DLOADER_NET_SUPPORT > -#CFLAGS+= -DLOADER_NFS_SUPPORT > -#CFLAGS+= -DLOADER_TFTP_SUPPORT > +LOADER_MSDOS_SUPPORT?= yes > +LOADER_UFS_SUPPORT?= yes > +LOADER_CD9660_SUPPORT?= no > +LOADER_EXT2FS_SUPPORT?= no > +LOADER_GZIP_SUPPORT?= yes > +LOADER_BZIP2_SUPPORT?= yes > > # Always add MI sources > .include "../../../loader.mk" > > Modified: head/sys/boot/mips/uboot/Makefile > ============================================================ > ================== > --- head/sys/boot/mips/uboot/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/mips/uboot/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -15,64 +15,17 @@ UBLDR_LOADADDR?= 0xffffffff80800000 > # Architecture-specific loader code > SRCS= start.S conf.c vers.c > > -.if !defined(LOADER_NO_DISK_SUPPORT) > -LOADER_DISK_SUPPORT?= yes > -.else > -LOADER_DISK_SUPPORT= no > -.endif > -LOADER_MSDOS_SUPPORT?= yes > -LOADER_UFS_SUPPORT?= yes > LOADER_CD9660_SUPPORT?= no > LOADER_EXT2FS_SUPPORT?= no > -.if ${MK_NAND} != "no" > -LOADER_NANDFS_SUPPORT?= yes > -.else > -LOADER_NANDFS_SUPPORT?= no > -.endif > +LOADER_MSDOS_SUPPORT?= yes > +LOADER_UFS_SUPPORT?= yes > LOADER_NET_SUPPORT?= yes > LOADER_NFS_SUPPORT?= yes > LOADER_TFTP_SUPPORT?= no > LOADER_GZIP_SUPPORT?= no > LOADER_BZIP2_SUPPORT?= no > -.if ${MK_FDT} != "no" > -LOADER_FDT_SUPPORT= yes > -.else > -LOADER_FDT_SUPPORT= no > -.endif > +LOADER_FDT_SUPPORT= ${MK_FDT} > > -.if ${LOADER_DISK_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > -.if ${LOADER_MSDOS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_MSDOS_SUPPORT > -.endif > -.if ${LOADER_UFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_UFS_SUPPORT > -.endif > -.if ${LOADER_CD9660_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_CD9660_SUPPORT > -.endif > -.if ${LOADER_EXT2FS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_EXT2FS_SUPPORT > -.endif > -.if ${LOADER_NANDFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NANDFS_SUPPORT > -.endif > -.if ${LOADER_GZIP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if ${LOADER_BZIP2_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if ${LOADER_NET_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NET_SUPPORT > -.endif > -.if ${LOADER_NFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > -.if ${LOADER_TFTP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > .if ${LOADER_FDT_SUPPORT} == "yes" > CFLAGS+= -I${.CURDIR}/../../fdt > CFLAGS+= -I${.OBJDIR}/../../fdt > > Modified: head/sys/boot/powerpc/kboot/Makefile > ============================================================ > ================== > --- head/sys/boot/powerpc/kboot/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/powerpc/kboot/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -14,10 +14,10 @@ SRCS= conf.c metadata.c vers.c main.c > ppc64_elf_freeb > SRCS+= host_syscall.S hostcons.c hostdisk.c kerneltramp.S > kbootfdt.c > SRCS+= ucmpdi2.c > > -LOADER_DISK_SUPPORT?= yes > -LOADER_UFS_SUPPORT?= yes > LOADER_CD9660_SUPPORT?= yes > +LOADER_MSDOS_SUPPORT?= no > LOADER_EXT2FS_SUPPORT?= yes > +LOADER_UFS_SUPPORT?= yes > LOADER_NET_SUPPORT?= yes > LOADER_NFS_SUPPORT?= yes > LOADER_TFTP_SUPPORT?= no > @@ -25,33 +25,6 @@ LOADER_GZIP_SUPPORT?= yes > LOADER_FDT_SUPPORT= yes > LOADER_BZIP2_SUPPORT?= no > > -.if ${LOADER_DISK_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > -.if ${LOADER_UFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_UFS_SUPPORT > -.endif > -.if ${LOADER_CD9660_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_CD9660_SUPPORT > -.endif > -.if ${LOADER_EXT2FS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_EXT2FS_SUPPORT > -.endif > -.if ${LOADER_GZIP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if ${LOADER_BZIP2_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if ${LOADER_NET_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NET_SUPPORT > -.endif > -.if ${LOADER_NFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > -.if ${LOADER_TFTP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > .if ${LOADER_FDT_SUPPORT} == "yes" > CFLAGS+= -I${.CURDIR}/../../fdt > CFLAGS+= -I${.OBJDIR}/../../fdt > > Modified: head/sys/boot/powerpc/ofw/Makefile > ============================================================ > ================== > --- head/sys/boot/powerpc/ofw/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/powerpc/ofw/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -13,10 +13,10 @@ INSTALLFLAGS= -b > SRCS= conf.c metadata.c vers.c start.c > SRCS+= ucmpdi2.c > > -LOADER_DISK_SUPPORT?= yes > -LOADER_UFS_SUPPORT?= yes > LOADER_CD9660_SUPPORT?= yes > LOADER_EXT2FS_SUPPORT?= no > +LOADER_MSDOS_SUPPORT?= no > +LOADER_UFS_SUPPORT?= yes > LOADER_NET_SUPPORT?= yes > LOADER_NFS_SUPPORT?= yes > LOADER_TFTP_SUPPORT?= no > @@ -24,33 +24,6 @@ LOADER_GZIP_SUPPORT?= yes > LOADER_BZIP2_SUPPORT?= no > LOADER_FDT_SUPPORT?= yes > > -.if ${LOADER_DISK_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > -.if ${LOADER_UFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_UFS_SUPPORT > -.endif > -.if ${LOADER_CD9660_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_CD9660_SUPPORT > -.endif > -.if ${LOADER_EXT2FS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_EXT2FS_SUPPORT > -.endif > -.if ${LOADER_GZIP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if ${LOADER_BZIP2_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if ${LOADER_NET_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NET_SUPPORT > -.endif > -.if ${LOADER_NFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > -.if ${LOADER_TFTP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > .if ${LOADER_FDT_SUPPORT} == "yes" > SRCS+= ofwfdt.c > CFLAGS+= -I${.CURDIR}/../../fdt > > Modified: head/sys/boot/powerpc/ps3/Makefile > ============================================================ > ================== > --- head/sys/boot/powerpc/ps3/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/powerpc/ps3/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -15,7 +15,6 @@ SRCS+= lv1call.S ps3cons.c font.h > ps3mmu.c ps3net.c p > ps3stor.c ps3disk.c ps3cdrom.c > SRCS+= ucmpdi2.c > > -LOADER_DISK_SUPPORT?= yes > LOADER_UFS_SUPPORT?= yes > LOADER_CD9660_SUPPORT?= yes > LOADER_EXT2FS_SUPPORT?= yes > @@ -26,40 +25,12 @@ LOADER_GZIP_SUPPORT?= yes > LOADER_FDT_SUPPORT?= no > LOADER_BZIP2_SUPPORT?= no > > -.if ${LOADER_DISK_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > -.if ${LOADER_UFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_UFS_SUPPORT > -.endif > -.if ${LOADER_CD9660_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_CD9660_SUPPORT > -.endif > -.if ${LOADER_EXT2FS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_EXT2FS_SUPPORT > -.endif > -.if ${LOADER_GZIP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if ${LOADER_BZIP2_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if ${LOADER_NET_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NET_SUPPORT > -.endif > -.if ${LOADER_NFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > -.if ${LOADER_TFTP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > .if ${LOADER_FDT_SUPPORT} == "yes" > CFLAGS+= -I${.CURDIR}/../../fdt > CFLAGS+= -I${.OBJDIR}/../../fdt > CFLAGS+= -DLOADER_FDT_SUPPORT > LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a > .endif > - > > CFLAGS+= -mcpu=powerpc64 > > > Modified: head/sys/boot/powerpc/uboot/Makefile > ============================================================ > ================== > --- head/sys/boot/powerpc/uboot/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/powerpc/uboot/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -12,11 +12,6 @@ MAN= > SRCS= start.S conf.c vers.c > SRCS+= ucmpdi2.c > > -.if !defined(LOADER_NO_DISK_SUPPORT) > -LOADER_DISK_SUPPORT?= yes > -.else > -LOADER_DISK_SUPPORT= no > -.endif > LOADER_UFS_SUPPORT?= yes > LOADER_CD9660_SUPPORT?= no > LOADER_EXT2FS_SUPPORT?= no > @@ -25,39 +20,8 @@ LOADER_NFS_SUPPORT?= yes > LOADER_TFTP_SUPPORT?= no > LOADER_GZIP_SUPPORT?= no > LOADER_BZIP2_SUPPORT?= no > -.if ${MK_FDT} != "no" > -LOADER_FDT_SUPPORT= yes > -.else > -LOADER_FDT_SUPPORT= no > -.endif > +LOADER_FDT_SUPPORT= ${MK_FDT} > > -.if ${LOADER_DISK_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > -.if ${LOADER_UFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_UFS_SUPPORT > -.endif > -.if ${LOADER_CD9660_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_CD9660_SUPPORT > -.endif > -.if ${LOADER_EXT2FS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_EXT2FS_SUPPORT > -.endif > -.if ${LOADER_GZIP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if ${LOADER_BZIP2_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if ${LOADER_NET_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NET_SUPPORT > -.endif > -.if ${LOADER_NFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > -.if ${LOADER_TFTP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_TFTP_SUPPORT > -.endif > .if ${LOADER_FDT_SUPPORT} == "yes" > CFLAGS+= -I${.CURDIR}/../../fdt > CFLAGS+= -I${.OBJDIR}/../../fdt > > Modified: head/sys/boot/sparc64/loader/Makefile > ============================================================ > ================== > --- head/sys/boot/sparc64/loader/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/sparc64/loader/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -15,6 +15,8 @@ SRCS= locore.S main.c metadata.c vers.c > LOADER_DISK_SUPPORT?= yes > LOADER_UFS_SUPPORT?= yes > LOADER_CD9660_SUPPORT?= yes > +LOADER_EXT2FS_SUPPORT?= no > +LOADER_MSDOS_SUPPORT?= no > LOADER_ZFS_SUPPORT?= no > LOADER_NET_SUPPORT?= yes > LOADER_NFS_SUPPORT?= yes > @@ -26,35 +28,11 @@ LOADER_DEBUG?= no > .if ${LOADER_DEBUG} == "yes" > CFLAGS+= -DLOADER_DEBUG > .endif > -.if ${LOADER_DISK_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > -.if ${LOADER_UFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_UFS_SUPPORT > -.endif > -.if ${LOADER_CD9660_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_CD9660_SUPPORT > -.endif > .if ${LOADER_ZFS_SUPPORT} == "yes" > CFLAGS+= -DLOADER_ZFS_SUPPORT > CFLAGS+= -I${.CURDIR}/../../zfs > CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs > LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a > -.endif > -.if ${LOADER_GZIP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_GZIP_SUPPORT > -.endif > -.if ${LOADER_BZIP2_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_BZIP2_SUPPORT > -.endif > -.if ${LOADER_NET_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NET_SUPPORT > -.endif > -.if ${LOADER_NFS_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_NFS_SUPPORT > -.endif > -.if ${LOADER_TFTP_SUPPORT} == "yes" > -CFLAGS+= -DLOADER_TFTP_SUPPORT > .endif > > # Always add MI sources > > Modified: head/sys/boot/uboot/lib/Makefile > ============================================================ > ================== > --- head/sys/boot/uboot/lib/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/uboot/lib/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -13,11 +13,6 @@ SRCS+= module.c net.c reboot.c time.c > > CFLAGS+= -ffreestanding -msoft-float > > -.if !defined(LOADER_NO_DISK_SUPPORT) > -SRCS+= disk.c > -CFLAGS+= -DLOADER_DISK_SUPPORT > -.endif > - > .if ${MK_FDT} != "no" > LOADER_FDT_SUPPORT= yes > .else > > Modified: head/sys/boot/userboot/userboot/Makefile > ============================================================ > ================== > --- head/sys/boot/userboot/userboot/Makefile Mon Oct 16 03:59:44 2017 > (r324652) > +++ head/sys/boot/userboot/userboot/Makefile Mon Oct 16 03:59:52 2017 > (r324653) > @@ -5,6 +5,11 @@ MAN= > .include > MK_SSP= no > > +LOADER_MSDOS_SUPPORT?= yes > +LOADER_UFS_SUPPORT?= yes > +LOADER_CD9660_SUPPORT?= no > +LOADER_EXT2FS_SUPPORT?= no > + > SHLIB_NAME= userboot.so > MK_CTF= no > STRIP= > >