From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0FqsI6aU/mDaigAAgWs5BA (envelope-from ) for ; Mon, 26 Jul 2021 12:55:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QIsuH6aU/mC4aAAAbx9fmQ (envelope-from ) for ; Mon, 26 Jul 2021 10:55:34 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C7885174E5 for ; Mon, 26 Jul 2021 12:55:33 +0200 (CEST) Received: from localhost ([::1]:56328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m7yGi-0001Ol-Sz for larch@yhetil.org; Mon, 26 Jul 2021 06:55:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m7yGF-0001OC-4w for guix-patches@gnu.org; Mon, 26 Jul 2021 06:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m7yGD-0004fA-T7 for guix-patches@gnu.org; Mon, 26 Jul 2021 06:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m7yGD-0003e3-TB for guix-patches@gnu.org; Mon, 26 Jul 2021 06:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49552] [PATCH] gnu: u-boot: Update to 2021.07. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Jul 2021 10:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49552 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vagrant Cascadian Cc: Mathieu Othacehe , Pierre Langlois , 49552@debbugs.gnu.org Received: via spool by 49552-submit@debbugs.gnu.org id=B49552.162729689813999 (code B ref 49552); Mon, 26 Jul 2021 10:55:01 +0000 Received: (at 49552) by debbugs.gnu.org; 26 Jul 2021 10:54:58 +0000 Received: from localhost ([127.0.0.1]:50035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m7yG3-0003dd-LG for submit@debbugs.gnu.org; Mon, 26 Jul 2021 06:54:58 -0400 Received: from mout.gmx.net ([212.227.15.18]:33551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m7yG0-0003dO-4u for 49552@debbugs.gnu.org; Mon, 26 Jul 2021 06:54:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1627296878; bh=PFSWWGltSb29/UAjgVTKOTn6io+LyiAzz+v+QnqP124=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:In-reply-to:Date; b=XCOLgWr+47zySzz0cwEfvmuDNeAcfjJr+5IIu2CqKT+ZAsadG1Ha6+Q0tNulZLpXw GcToQkz3HlmaH0Vw4BbxepT3OHddkGrjLU3kQQct63jBn/CqmzJ9LmtNkekdyaExyV xwNr60ROWPMeuaM6Jd0xdn1DVE2wIOmwRjcMr4vg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MCbEf-1lyvxl1Nml-009cyX; Mon, 26 Jul 2021 12:54:38 +0200 References: <87mtqqkmwo.fsf@gmx.com> <875ywyqtfj.fsf@gnu.org> <87lf5ugw71.fsf@yucca> User-agent: mu4e 1.4.15; emacs 27.2 From: Pierre Langlois In-reply-to: <87lf5ugw71.fsf@yucca> Date: Mon, 26 Jul 2021 11:54:29 +0100 Message-ID: <87mtq9s5ui.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:MJVuciFE++rdRXvy5uD8OO38QchdZPoYg5g2nP0k5gBEJ3/IR6B CeiYOeti5tnu4IWFmrtZNyDc+tNexAkZ+9UlzsHF5nyrWEUwC8PAFcITm/cSG4eTbj+3MlM mSTOtrYxt2eOx1ISyODiFOKUck+MbrC2+mYVc1m+pLBgpDuMSyWdwZjDPKG08FLPLvIsgvO U0N/pbBEQHxFfpBmRNYjg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Yzirn6Thcvs=:0sHjTlS0xCGQn5egu6BMax xR0izPadHH/50oFO9asvsdBK9GVUaQXDux+2p+IvOlav5amVZaHlXEXnAxVWaQV+3QDfuJxNY REiY37u5czuhQuBRK4EgY0BIC4Sbka6ETFEZt1dUj4WVXhsKiye/GQCOsj1OoR5FBWkjon3qb D5L5nwZq+hv+8yb3Q5K5v//LLy8zIAioinSaYveNaxhG4/GBXZWwDLIp1JLTyf2nVogO1EeAa 1QffGS1zxemcATjGOPMaJjoH9/Hk/ZKnVa/97mx1lIfWZO8udxRknqadb4GZYL4n6JuE8ZMvZ L8tVdyUrAO6ih9Z6ViQbH5g+a8Awqk+YkgVZfqpEzzGuSA0n6/64iqLISvUmkLPZ7gC99B0NJ Uur0wpETAlvbVpfq16bh8lfK6dIV8R9fiDwoFiLlMZ6aAuw409l7oL1hGfUDLvZUcFK3WJw9T Ie+ZHqOK3cF2EvRY9QWwKwxYUyjsXucQlqlkLBNYUWKoBu/P/GJWPkvJG0nMcO0d0X25I5+jI VKSWSEfjZ9G+c/b5QWn20XT0ENJoaaPUG7CvsInokY9J5HNZEr0Okhrusf3eJ6tixSMqCR9c2 CIVo9sJDK62YzcbGgZIADKO9ZnV0eO2Bsfr1c7mlYPIrrwIkyiGapDNR1C98dvosCKGt78pz3 dc0eMqp7XSjx9UIJdL6f3l0G4XhuWrRqSN5p0rGzwl9eB2HxmDQ8nD8U46FdeEibI2us0ffG3 l6svEhmx4swt+I+nQILw4k2EhXsWVSgofkluoh9Gki3RmQEXHMLdLq7uy4IdUre5Yd3P1dT6i +P/6M4uCfPUgEki74nmNuboTLeWiLrfWwx/a0Qgf3CaiLd+8GRMc4ehTK0mufyACRGbiabbOc FzkibdZzkOlD18qxX2em3s2jLRxT6dJLRklHfattoeRu86zIbwiKLPTy4jzaUO8o79LfcIyFG NUfoWjCnASh+AzGq+/GxUAuH5ovUw9o6+NYXcZDiJ1QtGkMax+dghVNQCXsWTkRaZEBXuQtJC 2sABGKPc+BZBeS3kR+aRAAhte1pOWfI8eApHGeOB/FHHRBYVXHfCf7L/PvnNb6GUpLtPllJy7 xxNw1cxo57ssI1/E2eDUe4G4XHfkOFC6ESa60zFS029njZFz8PJbsiIzA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627296934; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=I4L+ymqES46po6+VooQ4oUQznnyuO4GmlhzRBzhuRkI=; b=rhl5BdEwzNBqh51PTpXRgk43QwnFHPhX53r52pC7kmRCIWbs5FzcbDKYxgvvllxCR8Fxlw 0DdlXvNQPlgt0yc7bCttx0c99abd8aGroB54qj0lDW2PnScxY+r5O7OPYpM4rKhGVj5Ux7 vElOtCNDG1P4ArVJkPnNTngUSXCXv83bs25KDZvFAeb0tCAF+6WCXXTYuaFnpI5zznjK+X zg1qS7ERUoZu2dTEifUWHj332rKzZ+BBqntIO4pbC2LFtFz8GR5eRbbILcKmNjgUtqNrn4 na3CPYidO9jjwvXY/Btt+PD6hZJOzLQxzcnhzJr+taAqjVZFOv23cjB6ts6EOg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627296934; a=rsa-sha256; cv=none; b=CxJrVNbOjeoyLcCeLZOk2TXq9ble99nBCB/JlTe/+Kt/48/viYCnTvggZwTYyXg0Avlrz4 F0iPTi/SCU8g7idyxS1jTHUFHw1lTPVXWOGvIi2ICpB5PH38DBWPCaSfOBCMt7G2Fwk4zZ +KQvSNjPC/QIn+N05ygCOH9M1o7rsF1OmzX1SUKcULO0xmlqvhFmdFTvN0/RKmJxDuqD6I YO2AoyqrRDA9e4FdZr1/p1S6n/9tk+mRrmey6P/qONpc4H2szr1AId2kdojVQMB79kRtBt Ac3SaowUSjosCjQYZoXaEPXSfEjcoVUINhbW1g2B50jDN4eQU9SAuXK6M+cuuA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=XCOLgWr+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=XCOLgWr+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C7885174E5 X-Spam-Score: -3.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: fvTH7h5IQXQB --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hi! Vagrant Cascadian writes: > On 2021-07-25, Mathieu Othacehe wrote: >>> * gnu/packages/bootloaders.scm (u-boot): Update to 2021.07. >>> [native-inputs]: Add python-pycryptodomex. >>> (u-boot-2021.07): Delete variable. >>> (u-boot-tools)[arguments]: Adapt 'patch phase, disable failing test_spl test. >>> (u-boot-sifive-unmatched): Use default u-boot package. >>> (u-boot-pinebook-pro-rk3328): Use default u-boot package. >> >> This seems fine to me, Vagrant any objections here? > > Heh. Just uploaded 2021.07 to Debian last night! Been meaning to look at > updating in guix, but apparently someone beat me to it :) > > Overall, sounds fine to me, with one relatively minor change... > > u-boot-sifive-unmatched will need a pretty trivial patch in order to > update to 2021.07: > > https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 > https://salsa.debian.org/debian/u-boot/-/blob/debian/latest/debian/patches/riscv64/unmatched-prevent-relocating-initrd-and-fdt.patch > > At least, it did when building on Debian (and apparently Ubuntu)... Sure, I've added the patch! I don't have any HW to test sifive unmatched support though, I did test the update on a pinebookpro and rockpro64 when originally posting this, the new patch shouldn't affect them. That being said, while it works on pinebookpro, I still need an extra patch on the rockpro64 in order to boot, both on master with u-boot 2021.07 :-/ (see #49550). Were you able to confirm the issue? I see it looks like we have the same configuration in debian and guix, CONFIG_USE_PREBOOT=y and the "inno-usb" patch applied, mmmm Thanks, Pierre --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmD+lGUYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UoOQIAMrpMHGaKlgoW8O8lXXKWLlk 48fcA8PEmtJ72mp+GGCHbqrgNsUu2JSoHuYckLIFv9WNVQWYx9Dk5YhYRS2KC+nq 5gMiwAPy/VqrX/gH4mVkCtlkAJHzi+qjfrVjQbxtUvB9fUh3WIDLMXBcDYE10Sbf rfgpA6u2q2G6+LM2Zef/uIed5UUUN8Qg1oGmF5juKm+TIwLZvpeKUfflsLql9wCw i02KwHQ3Pse19g/BqdujGtPvN1u3tAYVAv/lKwrWqmjjhO4ZPHgBP1P52apSZZE5 8WiKGkDjjIS6lufwuwdWW5wD9EnwSrxyxv+g5xXCSmD4iPRbsmbpbJDiSpeKni8= =M9md -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-u-boot-Update-to-2021.07.patch Content-Transfer-Encoding: quoted-printable >From 8a7b8f0b85a69fff085bd07da6777c1ebca31f74 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 10 Jul 2021 14:12:02 +0100 Subject: [PATCH] gnu: u-boot: Update to 2021.07. * gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd-fdt.patch: N= ew patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bootloaders.scm (u-boot): Update to 2021.07. [native-inputs]: Add python-pycryptodomex. (u-boot-2021.07): Delete variable. (u-boot-tools)[arguments]: Adapt 'patch phase, disable failing test_spl tes= t. (u-boot-sifive-unmatched): Use default u-boot package. (u-boot-pinebook-pro-rk3328): Use default u-boot package. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 48 ++++++++----------- ...sifive-prevent-relocating-initrd-fdt.patch | 16 +++++++ 3 files changed, 36 insertions(+), 29 deletions(-) create mode 100644 gnu/packages/patches/u-boot-sifive-prevent-relocating-i= nitrd-fdt.patch diff --git a/gnu/local.mk b/gnu/local.mk index b944c671af..495a94a988 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1772,6 +1772,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ + %D%/packages/patches/u-boot-sifive-prevent-relocating-initrd-fdt.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 742992a119..09125b1582 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -12,7 +12,7 @@ ;;; Copyright =C2=A9 2019 Mathieu Othacehe ;;; Copyright =C2=A9 2020 Bj=C3=B6rn H=C3=B6fling ;;; Copyright =C2=A9 2018, 2019, 2020 Vagrant Cascadian -;;; Copyright =C2=A9 2020 Pierre Langlois +;;; Copyright =C2=A9 2020, 2021 Pierre Langlois ;;; Copyright =C2=A9 2021 Vincent Legoll ;;; Copyright =C2=A9 2021 Brice Waegeneire ;;; @@ -56,6 +56,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages sdl) @@ -493,20 +494,26 @@ tree binary files. These are board description files= used by Linux and BSD.") ;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1= 187379-1-icenowy@aosc.io (search-patch "u-boot-rockchip-inno-usb.patch")) =20 +(define %u-boot-sifive-prevent-relocating-initrd-fdt + ;; Fix boot in 2021.07 on Hifive unmatched, see + ;; https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 + (search-patch "u-boot-sifive-prevent-relocating-initrd-fdt.patch")) + (define u-boot (package (name "u-boot") - (version "2021.04") + (version "2021.07") (source (origin (patches - (list %u-boot-rockchip-inno-usb-patch)) + (list %u-boot-rockchip-inno-usb-patch + %u-boot-sifive-prevent-relocating-initrd-fdt)) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" "u-boot-" version ".tar.bz2")) (sha256 (base32 - "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd")))) + "0zm7igkdnz0w4ir8rfl2dislfrl0ip104grs5hvd30a5wkm7wari")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) @@ -516,6 +523,7 @@ tree binary files. These are board description files u= sed by Linux and BSD.") ("perl" ,perl) ("python" ,python) ("python-coverage" ,python-coverage) + ("python-pycryptodomex" ,python-pycryptodomex) ("python-pytest" ,python-pytest) ("swig" ,swig))) (build-system gnu-build-system) @@ -525,21 +533,6 @@ tree binary files. These are board description files = used by Linux and BSD.") also initializes the boards (RAM etc).") (license license:gpl2+))) =20 -(define-public u-boot-2021.07 - (package - (inherit u-boot) - (version "2021.07-rc4") - (source (origin - (patches - (list %u-boot-rockchip-inno-usb-patch)) - (method url-fetch) - (uri (string-append - "https://ftp.denx.de/pub/u-boot/" - "u-boot-" version ".tar.bz2")) - (sha256 - (base32 - "0bnsywgy2b0jxim5h9dc807lqk5kq8hvgf4lcsmffnc0hf4isv8p")))))) - (define-public u-boot-tools (package (inherit u-boot) @@ -568,9 +561,12 @@ also initializes the boards (RAM etc).") ;; This test would require git. (("\\./tools/patman/patman") (which "true")) ;; FIXME: test fails, needs further investiation - (("run_test \"binman\"") ": run_test \"binman\"") + (("run_test \"binman\"") "# run_test \"binman\"") + ;; FIXME: test_spl fails, needs further investiation + (("test_ofplatdata or test_handoff or test_spl") + "test_ofplatdata or test_handoff") ;; FIXME: code coverage not working - (("run_test \"binman code coverage\"") ": run_test \"binman = code coverage\"") + (("run_test \"binman code coverage\"") "# run_test \"binman = code coverage\"") ;; This test would require internet access. (("\\./tools/buildman/buildman") (which "true"))) (substitute* "test/py/tests/test_sandbox_exit.py" @@ -879,11 +875,7 @@ to Novena upstream, does not load u-boot.img from the = first partition.") (make-u-boot-package "sifive_fu540" "riscv64-linux-gnu")) =20 (define-public u-boot-sifive-unmatched - (let ((base (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu")= )) - (package - (inherit base) - (version (package-version u-boot-2021.07)) - (source (package-source u-boot-2021.07))))) + (make-u-boot-package "sifive_unmatched" "riscv64-linux-gnu")) =20 (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) @@ -946,9 +938,7 @@ to Novena upstream, does not load u-boot.img from the f= irst partition.") (define-public u-boot-pinebook-pro-rk3399 (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gn= u"))) (package - (inherit base) - (version (package-version u-boot-2021.07)) - (source (package-source u-boot-2021.07)) + (inherit base) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) diff --git a/gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd-f= dt.patch b/gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd-fdt= .patch new file mode 100644 index 0000000000..a5b92e3e8f --- /dev/null +++ b/gnu/packages/patches/u-boot-sifive-prevent-relocating-initrd-fdt.patch @@ -0,0 +1,16 @@ +Description: prevent relocating initrd & fdt, that results in failure to b= oot +Author: Heinrich Schuchardt (xypron) +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246 +Index: u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- u-boot-2021.07~rc4+dfsg.orig/include/configs/sifive-unmatched.h ++++ u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h +@@ -62,6 +62,8 @@ + "name=3Dsystem,size=3D-,bootable,type=3D${type_guid_gpt_system};" +=20 + #define CONFIG_EXTRA_ENV_SETTINGS \ ++ "fdt_high=3D0xffffffffffffffff\0" \ ++ "initrd_high=3D0xffffffffffffffff\0" \ + "kernel_addr_r=3D0x84000000\0" \ + "fdt_addr_r=3D0x88000000\0" \ + "scriptaddr=3D0x88100000\0" \ --=20 2.32.0 --=-=-=--