Date: Mon, 7 Feb 2022 00:42:42 -0700 From: Warner Losh <imp@bsdimp.com> To: Mark Millard <marklmi@yahoo.com> Cc: Kyle Evans <kevans@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: 9dc70af83e59 - main - stand/uboot: reorg Message-ID: <CANCZdfo_2j_g9JPV5S-%2B_0_gz1P1jrXRXWws=NfwmOgSP0=MDQ@mail.gmail.com> In-Reply-To: <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C@yahoo.com> References: <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C.ref@yahoo.com> <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 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 <manu@FreeBSD.org> 2021-05-11 18:27:14 +0000 > committer Emmanuel Vadot <manu@FreeBSD.org> 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 > > [-- Attachment #2 --] <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Feb 7, 2022, 12:26 AM Mark Millard <<a href="mailto:marklmi@yahoo.com">marklmi@yahoo.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Kyle Evans <<a href="http://kevans_at_freebsd.org" rel="noreferrer noreferrer" target="_blank">kevans_at_freebsd.org</a>> wrote on<br> Date: Sun, 6 Feb 2022 23:30:37 -0600 :<br> <br> > . . .<br> > Hey Warner,<br> > <br> > ubldr.bin used to be built/installed unconditionally above<br> > . . .<br> > But now it's behind MK_PIE, which is disabled in numerous places<br> > through stand/ as well as in <a href="http://defs.mk" rel="noreferrer noreferrer" target="_blank">defs.mk</a>. This broke the armv7 snapshot<br> > build, which is expecting a ubldr.bin it can pluck out.<br> > <br> > I suspect the intention was to specifically avoid it in powerpc64, but<br> > we'll need to re-work it a tad bit.<br> > . . .<br> <br> But . . .<br> <br> <a href="https://cgit.freebsd.org/ports/commit/sysutils/u-boot-rpi2?id=0d6e5081eb00" rel="noreferrer noreferrer" target="_blank">https://cgit.freebsd.org/ports/commit/sysutils/u-boot-rpi2?id=0d6e5081eb00</a><br>; <br> shows:<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">The release scripts should be updated to stop the useless copying.</div><div dir="auto"><br></div><div dir="auto">Warner </div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> author Emmanuel Vadot <manu@FreeBSD.org> 2021-05-11 18:27:14 +0000<br> committer Emmanuel Vadot <manu@FreeBSD.org> 2021-05-11 20:22:54 +0000<br> . . .<br> <br> sysutils/u-boot-*: Remove ubldr support<br> <br> We have been using loader.efi on armv7 for a long time now.<br> Remove support for booting with ubldr and the needed patches that were<br> never upstreamed.<br> While here add CONFIG_EFI_GRUB_ARM32_WORKAROUND=y in the Fragment as it's<br> needed to have the cache flushed for us when loader.efi is started.<br> <br> Diffstat (limited to 'sysutils/u-boot-rpi2')<br> -rw-r--r-- sysutils/u-boot-rpi2/Makefile 2 <br> 1 files changed, 2 insertions, 0 deletions<br> diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile<br> index f875b8840cab..d11d15970b04 100644<br> --- a/sysutils/u-boot-rpi2/Makefile<br> +++ b/sysutils/u-boot-rpi2/Makefile<br> @@ -6,6 +6,8 @@ MODEL= rpi2<br> BOARD_CONFIG= rpi_2_defconfig<br> FAMILY= rpi<br> <br> +U_BOOT_SLAVE_PORTREVISION_2021.04= 1<br> +<br> DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware<br> <br> CONFIG_FRAGMENT= ${.CURDIR}/files/rpi2_fragment<br> <br> <br> ===<br> Mark Millard<br> marklmi at <a href="http://yahoo.com" rel="noreferrer noreferrer" target="_blank">yahoo.com</a><br> <br> </blockquote></div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfo_2j_g9JPV5S-%2B_0_gz1P1jrXRXWws=NfwmOgSP0=MDQ>