From nobody Mon Feb 07 07:26:50 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 CD75B19B349D for ; Mon, 7 Feb 2022 07:26:58 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic313-21.consmr.mail.gq1.yahoo.com (sonic313-21.consmr.mail.gq1.yahoo.com [98.137.65.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jsd4d4C5dz3tFy for ; Mon, 7 Feb 2022 07:26:57 +0000 (UTC) (envelope-from marklmi@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1644218815; bh=uMds8mRvL9IwqzttthF8ZWMVIpnHkVDruN8cPNmv+VY=; h=From:Subject:Date:Cc:To:References:From:Subject:Reply-To; b=WjTXi1pncCC9qHniZHY4EKIf4K7Kxwm7wGCoZIW3355qeBXWqi2cE1irQFagXNV8siBpPcW2qg/L6+zyVpEH8L3PCiDAyFwEs2D+X58SGYSvLk8Adkak5UrpNMUZPp9yj7DPtImXOzG8jTy5yZ7Jm1upH5mnn5c97AJVetTKVeEVxfOGPGzMJ8cBI9LaMDUOL/3aKw8hQtNzhlkJ9NBaM1aWCIWx0UepZBfsMV0rQjT8allbyfPt642Tvpun+/9m6kGbOAI2slrl2Cb90k99z2PrTCzbjOno1S4tObZMtKPlHp+gJ3fF1QaCp81bcm+z1o/l9PORCvBYEK+M7sASWg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1644218815; bh=W4qW92Ds+ainXj6m8ZGaq1USAE65xAw0P1tt8SyITep=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=R3fKXpDgrHTBJ/jiZBRB6ZMDvwHNobgH8e+Mi0bLvJXAIbYgwuJk3gezA5ZYb0uWDW75qN/SESt8ZAEbZs/OjnwGdjtQGoSSSw7cKa3gMCa3aeb+FrIm3/LvDeWg+n5i5H6b1jUSdRi7dVGMTKPcdSb4+2/XqQ8KdNWl6oftPouzXWEBnjbApv4Gj5gwNhFPnk4OyaAPU9rTBe/TF29LraWp8ZMEg1wIfYW5H9EfFaArvU3xUEWyjxyxYw+1Myf6SVnkBiINcbegbNnMHMd0kk9ik7kBuJAjfS+d7rjCZEWIkLktMxe4V6usFBU99458vbketCif2JLmAUP8AKyDqg== X-YMail-OSG: aguSg0oVM1mXQ5qWJJfCKWekh2nTWT4UAN_hroC6YJKMqzrL9EWm.GY_jDW3OQw idmOqmt.LYLcV3R8oWEDumUWdsrq.PgIiE6gIoaCvoIcxppgg5OEv3f00jWLxvMlgin7wJln7Zc. 3BTSv05wYPpMij4r242AC.opPrTMT0.lNZSnOPpbFHftk.NFIM7VdymiclfUJoJ9oIYT_lVgmPEq _fJbm2fEzrmTeqLx34GHHeFHIvId9D2q4dUA78x.yI_bn6MAwFHkQPKOxuj3EZaTjl3Wx45DbEgN ibNfUB7LhDE_oKQUN7SDa7_CcXaSmGAKqhEBXEkVP5OeFuHaXtvGoWZnh_3WLxIW3OBGLKv_JhQG Y8TQcLihGM1qVxZiZep9R0CVEqJW6xliu4YKjWB5c0kY4e_7XHuQySGE1HH7ora1LtYexmrVqeEc 2_II4onQr.icCynywJ8GJoTOPvsuAWijEJt0LPBW6KOowVHjActvf7tOjhuE6._Uv15W74LfYtNs _CPpvvK_GKxpN7bHXhHzrdHzOVigwD82FVzB.39TchkJf99gOJHWgjnnb2qIuEED98dhG3I.D.S. fFitaYGv1EEG04snOOBnOqYon79xkY3hSS99S7Sd6WuNLpurfSgXHA2APc2ay8FirJ7wRP22bE15 gkKwD66X5utBtlgYU7jaseU84IZBjXyc0DRSTkcD4b1WG53lETT47XyPMbB6G_z7Kf8hJwPp1HS4 sEvtWWwL_2YukiFiO0rSY9HTHJxXa.Jc0VdJCXn1qFXrh0aEhn6.nKCyTJE7zUY8TcD2B8SY5V_o PaVlgr4ZD9QFn9PVlm0LUlbZEt1CxHnirSXZdcMSATSFQAbju6tk4CXJ2A.V.9SbO7ZUxdJnO7X5 BrXjQaX16dkhvSDl5sU09UIxAZneakYmAuOxvH8Dm016qaBAAzr72f08VDkjrLl3_n9eVlvVAsT2 4OoL20uPg7QvKd0IJwpNkTnani1h8_o8In8kv6xZbDAOtEc1fycIDMcUgrynuaH4BY2yimSThgT7 UG1SB.tCj4VIWZIsf4zmvJwZZE3nq_mI5ToHxsJfNXWWrPylFxRuL5JPDUn4UHKq07tmrQqr17NC kLOX87oKoDDrM8qehR0CEfqGb40oMtD9i5K4vbAbciFBiOHNBaYU9xVUDipvNvIjqLC7olIkGo3b nk4g1TG8LwanwBlKmVPf_C7d3di7oE76iAv6RVkR2e9CfBou6My6ycwgze3FdIXQtHWQ1Jhi7zMT hUSpI7yl0jGt6UJnuUYNbQa.c57fDuKhxG6Q9eSc9m1QAwnHEkwCMM1sXtnGrBIzNXw04GSnldMv ptCFQZck0C5eAn2Q0rXZqdiCYEgnZLv9L0XpoE5RJuBEZfZrFoH9wyAMDEOhiu0Gnh07BdGoZBOl _HwVBfCEKSvM.TI3U0pNg0Hb_mgxAmYwwBrEZNLhAFp7pkNJ2eOjyQ0he2bahCw74Eaa90ZKKOlj sh_gx9UvHE8Ah_3kXTCELId3ofi1Q_txf3KsC48cupf4HmSvlsM_DOF3ivyvVKCl82zN5EzzFbR7 V8xWLSil0vlnptocD.T0OfVL6SIHTX1lTZApXUVzS2p6IhoYyTmaurnf9oddaAlu7pdKOehtXzCs 6OIlwk1ncSDvZLtTqq3SKMCQ5TL6X3y3DQweaoP0hWqCSA9X7G4H0TzE_xbsDaALUpihfgrNyBUa c_a1EfS9tLP9qLnNismXLNaZlp2l4EJ9ImueM9H4HKlxRHTuINC7csjn5ae9Kq3Dj69lPl9IlZfM 9GJxQR6s4_bjsi6JQt8SE5V9Nqukz1B8QcntFw_09yTpAaZND74sOWTl5k15KUdtcfHbdQW7Vr05 VwnlFtRcadRpWDRo_M2as8Oi_7bYe98ix.5RO4Z_iCj9copJzcUv496e3xBZpQbi.TFEzpT4bcVG lRDc7ipvGcz8nN3PjYfIPEtnIrQ_6zgFt3prKC_WAn2NcLUnOIKh_k2XrAinmADTmPg21HSNaRqR C287uS45GctsH0547JF0k7hQD9GqIcLmliKcWxZ9uNVDwbjKC8nN6c4vKmx.1cvA7K1X7OYSQ7kp LIREerrIAFROpvBgj26XFyHQKFsA3db8S.kw2VR02yv9730PHbQU1bAG_4DvXCtUBV9bdTWkQI4T 0YDgYNzShr17pU_E1QdA63u9u1RTw7pjX8qKvbuUAWrinZiu8jtx7rHQiJTB9Zv3CsyP2HxvNV7q VXzr0CLK4oevVe3_jLx5pPjGkh_mtkTg9QWLHaSFCUiaiVgzmbs9ILnCYtaUQaTNQlQQ2rfBuj1j vhGrT7W_mS4zKxpdHzNWp5eS.wVHDy0BRs0MSYYtJ149W2HkOIl_sUGIhNn3XgTBHPjc.VzSOQRQ DKvIQbBocM.qlGLJa X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.gq1.yahoo.com with HTTP; Mon, 7 Feb 2022 07:26:55 +0000 Received: by kubenode512.mail-prod1.omega.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID e7bbe991902480815857fa6078c53e98; Mon, 07 Feb 2022 07:26:50 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Subject: Re: git: 9dc70af83e59 - main - stand/uboot: reorg Message-Id: <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C@yahoo.com> Date: Sun, 6 Feb 2022 23:26:50 -0800 Cc: Warner Losh To: Kyle Evans , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3654.120.0.1.13) References: <550D1AEC-90AB-4190-BD7E-CB28E22B2D2C.ref@yahoo.com> X-Rspamd-Queue-Id: 4Jsd4d4C5dz3tFy X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=WjTXi1pn; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.84 as permitted sender) smtp.mailfrom=marklmi@yahoo.com X-Spamd-Result: default: False [-1.88 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-0.99)[-0.986]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_MEDIUM(0.61)[0.605]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.84:from]; MLMMJ_DEST(0.00)[dev-commits-src-main]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.84:from]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N 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: 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