From nobody Mon Feb 07 05:30:37 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BC79F19B5B17; Mon, 7 Feb 2022 05:30:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JsZVc4y8Xz4c4G; Mon, 7 Feb 2022 05:30:48 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644211848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cnq6MdnRG3uIH46DbwKKHarylY36EdHihaS7J54G7wE=; b=r3zPIwIzgGqFZpaudMP7ULcLnq3D0tbX01YdCtCezhVet6zG27niWu+DprUef0083ZKlmC OzMRRGDMq0jagO3ZA0OSB/Ci6fLoVEQcPjkn1n3xZ7tLubBNy7f4YgikKe3hEd5Pv1YDGK XhptF59HsCZrK3IyKk+iIknKmCLyDF15plPQhWpfWzsOI41tbnEB4Xw+OZR92HtlaDpZ9J QfjWMkl5UHtdSESyscGXqwkfbbQ3y3nqm17hqmB85ZvgwfokcbQ3Mh36UBvXbislvVpUoU 8OboMFdx6le5Z17p/grjFjDBmJlHh+tOzNK3EyfSzlsO+ldB+2gCW3rmBfIE0A== Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 83FED28B16; Mon, 7 Feb 2022 05:30:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f177.google.com with SMTP id p14so11109667qtx.0; Sun, 06 Feb 2022 21:30:48 -0800 (PST) X-Gm-Message-State: AOAM530a4+h9E23qL/8vXoQjxRfGeGuF0AIkcCcOeRacRDMVwkOsoj+y 753xWB+1VaaGHXkEF8RWepWNbNwahUfIlUJVWPA= X-Google-Smtp-Source: ABdhPJztz5Zh01lUBA8WJA3J88RZM+iCux8ySjZKbHZygbOxIinu6FMIy1Ueoc/lMhZRII8Z84YdT/xLvI4RvcVdIoI= X-Received: by 2002:a05:622a:514:: with SMTP id l20mr6767616qtx.86.1644211848015; Sun, 06 Feb 2022 21:30:48 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202112150415.1BF4FGfh021651@gitrepo.freebsd.org> In-Reply-To: <202112150415.1BF4FGfh021651@gitrepo.freebsd.org> From: Kyle Evans Date: Sun, 6 Feb 2022 23:30:37 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 9dc70af83e59 - main - stand/uboot: reorg To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644211848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cnq6MdnRG3uIH46DbwKKHarylY36EdHihaS7J54G7wE=; b=ObygBGFxZ7jZfGJavgQaTIi4HizV82CGi8Bx3dCGpyGE50xm/TFnR4YetGwpVtT2w7uhzk w3kIf0sFuQQ1i9JjirsMQYiVmfiComz8F+bUo6Aeh6EoKBrX9x6Gq9/mY3ycsmfgvzLqgJ +JSHrVn5jMB2uthiHeC1+J18b84941LDkIUB6rDtaPBC0N1lXr2zPuThoWIaBsu2nE1ro/ Gq8U1f6ylvE3rNLrWABEnB2BJLb0QxKA3Lw5FiyJTX+jM1Z6RlHXD9/Xa/00T0fqK0xeOJ f1kbyX9fAHnl1fs9IdCrFVV3VTi5BeYsunbUVyBpmiT3n4VLrQ1gqyFBxkBhhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644211848; a=rsa-sha256; cv=none; b=MZwdzRQ+GS8YSxX57TDdnLDMmiazvnOKlb6HaB2PBaMEbGWn084TFwP5PsOZFDfFz9iNDF tnV2qr6yi4xXdIq3gx6LO/mfzTiAyF0nQv9z0mKCTQjGcaMihQzVjJ3KAo94ovqKl2RC5B FEgUu2hZOWOlicE4SmiZFMKl8jf/pCDcQmAY5dXeDWs+v+cYsNh48ZJQIjfDvQNaYY/8lk msFcwV9Zlkvm6nN3fWHzULGtiasRiUBbN1AEURppnBAXrUpc4zCz5VHxUWGMdOFDWBiVQB oPmzDwEa7SVFpvFWStOY7RGaoByg8qOs9UQrTDonEHk53BOEuciFFN4QimhkjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Tue, Dec 14, 2021 at 10:15 PM Warner Losh wrote: > > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9dc70af83e5992e543542adbf5a6edeb38f187f6 > > commit 9dc70af83e5992e543542adbf5a6edeb38f187f6 > Author: Warner Losh > AuthorDate: 2021-12-15 04:09:53 +0000 > Commit: Warner Losh > CommitDate: 2021-12-15 04:09:53 +0000 > > stand/uboot: reorg > > Build uboot ubldr and friends like we build efi binaries > o move everything to be under stand/uboot > o md code goes in arch/$ARCH > o move everything over from the library > - Had to rename console.c, disk.c and module.c due to conflicts > o update version to 1.5 to reflect the new way of building > > This results in a more consistent build system and should represent no > functional change, apart from powerpc version getting new help > file. Also, moved to exlcuding uboot on powerpc64le by using > BROKEN_OPTION instead of the incidental exclusion we had before due to > Makefile reorgs. > > Sponsored by: Netflix > Feedback by: stevek, jrtc27 > Differential Revision: https://reviews.freebsd.org/D33362 > [...] > --- a/stand/arm/uboot/Makefile > +++ /dev/null > @@ -1,68 +0,0 @@ > -# $FreeBSD$ > - > -LOADER_UFS_SUPPORT?= yes > -LOADER_CD9660_SUPPORT?= no > -LOADER_MSDOS_SUPPORT?= no > -LOADER_EXT2FS_SUPPORT?= no > -LOADER_NET_SUPPORT?= yes > -LOADER_NFS_SUPPORT?= yes > -LOADER_TFTP_SUPPORT?= no > -LOADER_GZIP_SUPPORT?= no > -LOADER_BZIP2_SUPPORT?= no > - > -.include > - > -FILES+= ubldr ubldr.bin > - Hey Warner, ubldr.bin used to be built/installed unconditionally above > diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile > index fde6f9c4e16e..aed2121bd507 100644 > --- a/stand/uboot/Makefile > +++ b/stand/uboot/Makefile > @@ -1,9 +1,81 @@ > # $FreeBSD$ > > +LOADER_UFS_SUPPORT?= yes > +LOADER_CD9660_SUPPORT?= no > +LOADER_MSDOS_SUPPORT?= no > +LOADER_EXT2FS_SUPPORT?= no > +LOADER_NET_SUPPORT?= yes > +LOADER_NFS_SUPPORT?= yes > +LOADER_TFTP_SUPPORT?= no > +LOADER_GZIP_SUPPORT?= no > +LOADER_BZIP2_SUPPORT?= no > +LOADER_DISK_SUPPORT?= yes > + > .include > > -SUBDIR.yes= lib > +.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" > + > +.if ${MK_PIE} == "yes" > +FILES+= ubldr ubldr.bin > +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} > +.else > +PROG= ubldr > +.endif > + > [... ] But now it's behind MK_PIE, which is disabled in numerous places through stand/ as well as in defs.mk. This broke the armv7 snapshot build, which is expecting a ubldr.bin it can pluck out. I suspect the intention was to specifically avoid it in powerpc64, but we'll need to re-work it a tad bit. Thanks, Kyle Evans