From nobody Mon Feb 07 07:42:42 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 192D319BB6A8 for ; Mon, 7 Feb 2022 07:43:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ua1-x935.google.com (mail-ua1-x935.google.com [IPv6:2607:f8b0:4864:20::935]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JsdR76zyWz4Sf6 for ; Mon, 7 Feb 2022 07:42:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ua1-x935.google.com with SMTP id 60so21421099uae.1 for ; Sun, 06 Feb 2022 23:42:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wt1zUN4+WyNUZMrM3ygs27mnhl4ixBogE/vMNQskPHw=; b=ZDmFyI6Ngrv/iHIAiuWgD0zPBUzbkd4w5OHdXT50RHeVv4bNUyhhI1asZ4bqeFjg6g /BFvF1BZ73pioVDBsZ3li95gbdJc6T5wmLXTJfI8fE6p4tS/xUD2lCarhJGmey4ny0J2 n5v/2fyQbSJO1+TeYqgfkcZw0xwZrPUIUvDXVOSFuIWxUSnqNzIIBuN9GAzVpEMSNH6p e0Zpz8z9Nu2X9uPVPga6lSNoXl5y4uzIEc51vR/b/hgcAuJHXY12X5+z/QN63ILy26HS KXoijjwKVw/Hc4DKXA1at3O+TD0sLd/C3O15/jvaThnjnRQpYttF49dire0Ui8RsuX+N TbRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wt1zUN4+WyNUZMrM3ygs27mnhl4ixBogE/vMNQskPHw=; b=JkCCJWemCFwcRRaqqYfdqfPxEMF/kq+QP5fsWyNzQGdmfTmYeElkp+lH79XuLspZSG HGxQP2+ybu6a2FZqLJMVB2GH/eEZDR3RgKldn9G+9qMTtohd7Hd2q4nXpOTEjj0wROGM AOOVZK1C5KThRAhDCFffd4Y12zZVfPMnESzx6a9B9TL1zJ3DJXjZmnnVVM2I08PMDpPT SNFODPhIfmvG8J+gOo2YKYeIxsqpAkAbuLeOfsiXnYew6UyN+FpCfA35x/h6sjIYQIA9 QdSHmQPsyRwaQzdJ4Srwdv7qhirbxQBT6Pex50a/Iv2sWi+XahdU3MB6L+YBlut2cIlJ 1daQ== X-Gm-Message-State: AOAM532fRKcQBOGmo021OKn9KL+0P6xdfuf+UOTENQ4dvzEYhMJ9sEo5 5+6dsrDBOHB7/h7OJ5AS4UMHuqAYRpFIEXT+PQCWhHQK7UA= X-Google-Smtp-Source: ABdhPJxigkKF2WayAmwWtvRsS0R/9oJ+tZGfru7M7YLLih60/RBBtmC04wXHjBUamYFrC2rNsKraQcj2QRuv+0jMcKw= X-Received: by 2002:ab0:2a07:: with SMTP id o7mr3141062uar.39.1644219772688; Sun, 06 Feb 2022 23:42:52 -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: <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C.ref@yahoo.com> <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C@yahoo.com> In-Reply-To: <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C@yahoo.com> From: Warner Losh Date: Mon, 7 Feb 2022 00:42:42 -0700 Message-ID: Subject: Re: git: 9dc70af83e59 - main - stand/uboot: reorg To: Mark Millard Cc: Kyle Evans , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000007bf42705d768bfc1" X-Rspamd-Queue-Id: 4JsdR76zyWz4Sf6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --0000000000007bf42705d768bfc1 Content-Type: text/plain; charset="UTF-8" On Mon, Feb 7, 2022, 12:26 AM Mark Millard wrote: > Kyle Evans wrote on > Date: Sun, 6 Feb 2022 23:30:37 -0600 : > > > . . . > > Hey Warner, > > > > ubldr.bin used to be built/installed unconditionally above > > . . . > > 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. > > . . . > > But . . . > > https://cgit.freebsd.org/ports/commit/sysutils/u-boot-rpi2?id=0d6e5081eb00 > > shows: > The release scripts should be updated to stop the useless copying. Warner author Emmanuel Vadot 2021-05-11 18:27:14 +0000 > committer Emmanuel Vadot 2021-05-11 > 20:22:54 +0000 > . . . > > sysutils/u-boot-*: Remove ubldr support > > We have been using loader.efi on armv7 for a long time now. > Remove support for booting with ubldr and the needed patches that were > never upstreamed. > While here add CONFIG_EFI_GRUB_ARM32_WORKAROUND=y in the Fragment as it's > needed to have the cache flushed for us when loader.efi is started. > > Diffstat (limited to 'sysutils/u-boot-rpi2') > -rw-r--r-- sysutils/u-boot-rpi2/Makefile 2 > 1 files changed, 2 insertions, 0 deletions > diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile > index f875b8840cab..d11d15970b04 100644 > --- a/sysutils/u-boot-rpi2/Makefile > +++ b/sysutils/u-boot-rpi2/Makefile > @@ -6,6 +6,8 @@ MODEL= rpi2 > BOARD_CONFIG= rpi_2_defconfig > FAMILY= rpi > > +U_BOOT_SLAVE_PORTREVISION_2021.04= 1 > + > DEPENDS= > ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware > > CONFIG_FRAGMENT= ${.CURDIR}/files/rpi2_fragment > > > === > Mark Millard > marklmi at yahoo.com > > --0000000000007bf42705d768bfc1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Feb 7, 2022, 12:26 AM Mark Millard <marklmi@yahoo.com> wrote:
Kyle Evans <kevans_at_freebsd.= org> wrote on
Date: Sun, 6 Feb 2022 23:30:37 -0600 :

> . . .
> Hey Warner,
>
> ubldr.bin used to be built/installed unconditionally above
> . . .
> 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 snapsho= t
> 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.
> . . .

But . . .

https://cgit.= freebsd.org/ports/commit/sysutils/u-boot-rpi2?id=3D0d6e5081eb00

shows:

The release scripts should be updated to stop the useless copying.

Warner=C2=A0

author=C2=A0 Emmanuel Vadot <manu@FreeBSD.org>=C2=A0 =C2=A0 =C2=A0 = =C2=A02021-05-11 18:27:14 +0000
committer=C2=A0 =C2=A0 =C2=A0 =C2=A0Emmanuel Vadot <manu@FreeBSD.org>= =C2=A0 =C2=A0 =C2=A0 =C2=A02021-05-11 20:22:54 +0000
. . .

sysutils/u-boot-*: Remove ubldr support

We have been using loader.efi on armv7 for a long time now.
Remove support for booting with ubldr and the needed patches that were
never upstreamed.
While here add CONFIG_EFI_GRUB_ARM32_WORKAROUND=3Dy in the Fragment as it&#= 39;s
needed to have the cache flushed for us when loader.efi is started.

Diffstat (limited to 'sysutils/u-boot-rpi2')
-rw-r--r--=C2=A0 =C2=A0 =C2=A0 sysutils/u-boot-rpi2/Makefile=C2=A0 =C2=A02= =C2=A0 =C2=A0 =C2=A0 =C2=A0
1 files changed, 2 insertions, 0 deletions
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile<= br> index f875b8840cab..d11d15970b04 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -6,6 +6,8 @@ MODEL=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 rpi2
=C2=A0BOARD_CONFIG=3D=C2=A0 rpi_2_defconfig
=C2=A0FAMILY=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 rpi<= br>
+U_BOOT_SLAVE_PORTREVISION_2021.04=3D=C2=A0 =C2=A0 =C2=A01
+
=C2=A0DEPENDS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0${LOCALBASE}/share/rpi-firmware/= bootcode.bin:sysutils/rpi-firmware

=C2=A0CONFIG_FRAGMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0${.CURDIR}/files/rpi2_fr= agment


=3D=3D=3D
Mark Millard
marklmi at yahoo.com

--0000000000007bf42705d768bfc1--