From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0A27C433EF for ; Fri, 7 Jan 2022 18:26:03 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF12183728; Fri, 7 Jan 2022 19:26:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="KMBSHIOL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9B35483747; Fri, 7 Jan 2022 19:25:58 +0100 (CET) Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7C16B83709 for ; Fri, 7 Jan 2022 19:25:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2b.google.com with SMTP id fo11so6236002qvb.4 for ; Fri, 07 Jan 2022 10:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Ef1noeI0SKpYjk9ecLA8pqlJLJQf9lhkx5jS3KRaHAs=; b=KMBSHIOLhG3dQjGjuqUfuPPUIt/KBAuVDaQGtFl0djKxWZElLJ6eLaRpQ0RzzRrJJx m9d7p14dM7t/OW1FwXAf0GB3P8FU0bzx6d5sM5zRn+YuqRKnZ0VQQsbE+HbSt8CeskcX F0HF3hnu74efpFwIjN4iCZo1ezNUiJPmQT2ng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Ef1noeI0SKpYjk9ecLA8pqlJLJQf9lhkx5jS3KRaHAs=; b=4tmGa5dqaGi3lrAeaExl0jTf2iF4BLZ/M2yxoXOCQOM2dK7Hhp4ZvPtQ0nQwPmIPYw BHe2qHFfilRTf+vpnDjdlHnD2EeqDBE1lzsqzb1zG+ftDdjVcWdgl6h3KPLjSzwWkDDo FMd8fqPmtwlfV3TaCW7Qh8kGeX2epb6NyfMJ83YUuCXYr9VSo2BAB9YLtouPju5/ppc6 jKOIrIsIwPWc0pElu5DjFu4UleqF6syEmz6qUg2oYCj1h6HjImSeEsmklvLlppZEo6kW AAMMbximOBG3y4pvmDNIoEZ1bkRa3m97hw+QzDO6j3MmFFWGrofKyWaVtoez24cVPTbL fXuA== X-Gm-Message-State: AOAM533IhF+WktRRnS6K4e0sCjrJbxgj1IdmIV3vsEjXktRj0Q6PrISh 7J2k4ycSFAvF4Gdu1cqEc5eCEQ== X-Google-Smtp-Source: ABdhPJzA4dNbPHdOQ2EO5u4MKkmg4wDBxR2VCviUD1eHCPz0EjWnjvx4tiu4RvYUvTH+1JZw6THnaQ== X-Received: by 2002:a05:6214:1cc7:: with SMTP id g7mr38983461qvd.65.1641579953069; Fri, 07 Jan 2022 10:25:53 -0800 (PST) Received: from bill-the-cat (2603-6081-7b01-cbda-f174-9b83-85b8-612f.res6.spectrum.com. [2603:6081:7b01:cbda:f174:9b83:85b8:612f]) by smtp.gmail.com with ESMTPSA id n11sm3903454qtk.44.2022.01.07.10.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 10:25:52 -0800 (PST) Date: Fri, 7 Jan 2022 13:25:50 -0500 From: Tom Rini To: Adam Ford Cc: Tim Harvey , ZHIZHIKIN Andrey , "u-boot@lists.denx.de" Subject: Re: [PATCH] Revert "tree: imx: remove old fit generator script" Message-ID: <20220107182550.GF2773246@bill-the-cat> References: <20220106185133.2375747-1-trini@konsulko.com> <20220107173751.GE2773246@bill-the-cat> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="owfka6xPfXVq+OmA" Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean --owfka6xPfXVq+OmA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 07, 2022 at 12:21:18PM -0600, Adam Ford wrote: > On Fri, Jan 7, 2022 at 11:38 AM Tom Rini wrote: >=20 > > On Fri, Jan 07, 2022 at 09:27:05AM -0800, Tim Harvey wrote: > > > On Thu, Jan 6, 2022 at 12:27 PM Tim Harvey > > wrote: > > > > > > > > On Thu, Jan 6, 2022 at 11:18 AM ZHIZHIKIN Andrey > > > > wrote: > > > > > > > > > > Hello Tom, > > > > > > > > > > > -----Original Message----- > > > > > > From: U-Boot On Behalf Of Tom Ri= ni > > > > > > Sent: Thursday, January 6, 2022 7:52 PM > > > > > > To: u-boot@lists.denx.de > > > > > > Cc: Tim Harvey > > > > > > Subject: [PATCH] Revert "tree: imx: remove old fit generator > > script" > > > > > > > > > > > > This reverts commit d9a6f0eed66a39206b13513ec914f14084c3bb73. > > > > > > > > > > > > For right now, it's too close to the release to merge the series > > that > > > > > > allows for binman to be used to generate the final images, and > > also not > > > > > > break CI, and then also merge all of the series that convert > > currently > > > > > > broken platforms to use binman instead. So, bring back this > > script now > > > > > > and remove it again for real after the release. > > > > > > > > > > Please note that this might not work, as the FIT generator script > > would > > > > > generate ITS with '@' symbols which are not compatible with mkima= ge > > due > > > > > to CVE-2021-27138. This revert should be complemented with the fi= x to > > > > > remove those '@' symbols as well. > > > > > > > > Correct, the revert is not enough anymore: > > > > MKIMAGE u-boot.itb > > > > u-boot.its:7.11-15.5: Warning (unit_address_vs_reg): /images/uboot@= 1: > > > > node has a unit name, but no reg property > > > > u-boot.its:16.9-21.5: Warning (unit_address_vs_reg): /images/fdt@1: > > > > node has a unit name, but no reg property > > > > u-boot.its:22.9-27.5: Warning (unit_address_vs_reg): /images/fdt@2: > > > > node has a unit name, but no reg property > > > > u-boot.its:28.9-33.5: Warning (unit_address_vs_reg): /images/fdt@3: > > > > node has a unit name, but no reg property > > > > u-boot.its:34.9-39.5: Warning (unit_address_vs_reg): /images/fdt@4: > > > > node has a unit name, but no reg property > > > > u-boot.its:40.9-45.5: Warning (unit_address_vs_reg): /images/fdt@5: > > > > node has a unit name, but no reg property > > > > u-boot.its:46.9-55.5: Warning (unit_address_vs_reg): /images/atf@1: > > > > node has a unit name, but no reg property > > > > u-boot.its:60.12-65.5: Warning (unit_address_vs_reg): > > > > /configurations/config@1: node has a unit name, but no reg property > > > > u-boot.its:66.12-71.5: Warning (unit_address_vs_reg): > > > > /configurations/config@2: node has a unit name, but no reg property > > > > u-boot.its:72.12-77.5: Warning (unit_address_vs_reg): > > > > /configurations/config@3: node has a unit name, but no reg property > > > > u-boot.its:78.12-83.5: Warning (unit_address_vs_reg): > > > > /configurations/config@4: node has a unit name, but no reg property > > > > u-boot.its:84.12-89.5: Warning (unit_address_vs_reg): > > > > /configurations/config@5: node has a unit name, but no reg property > > > > ./tools/mkimage: verify_header failed for FIT Image support with ex= it > > code 1 > > > > Makefile:1433: recipe for target 'u-boot.itb' failed > > > > make: *** [u-boot.itb] Error 1 > > > > make: *** Deleting file 'u-boot.itb' > > > > make: *** Waiting for unfinished jobs.... > > > > > > > > I don't know what had changed to cause this or when (again, I stopp= ed > > > > worrying about it because I thought we were moving to binman for th= is > > > > release). There was a patch that resolved this from Oliver at > > > > https://lists.denx.de/pipermail/u-boot/2021-August/457997.html but I > > > > don't think that fully solves anything 'at this point' either. > > > > > > > > Even with that applied to current master I then end up with: > > > > MKIMAGE flash.bin > > > > ./tools/mkimage: Can't open spl/u-boot-spl-ddr.bin: No such file or > > directory > > > > arch/arm/mach-imx/Makefile:167: recipe for target 'flash.bin' failed > > > > make[1]: *** [flash.bin] Error 1 > > > > make[1]: *** Deleting file 'flash.bin' > > > > Makefile:1526: recipe for target 'flash.bin' failed > > > > > > > > At some point over the past couple of months that patch resolved the > > > > building issue when using the FIT generator but I also don't know w= hat > > > > else has changed that now causes that to not work. > > > > > > > > As Tom pointed out in another thread these build failures did not g= et > > > > caught by CI apparently because CI does a 'make all' which did not > > > > include the FIT images (that was accomplished with the 'flash.bin' > > > > target prior to binman conversion). > > > > > > > > Is it too late to apply the CI fix and the pending binman conversio= ns? > > > > > > > > I know that my series has been reviewed by Marcel [1] and as far as= I > > > > know didn't get merged simply because of the CI issue. It still > > > > applies and produces a valid flash.bin image. > > > > I was also able to merge Peng's series [2] which converts > > > > imx8mq_evk/imx8mq_phanbell/pico-imx8mq to binman and was able to bu= ild > > > > flash.bin images for them > > > > > > > > I tried to merge Adam's series that moves imx8mm_beacon to binman [= 3] > > > > and imx8mn_beacon to binman [4] but they no longer apply due to > > > > defconfig/Kconfig changes > > > > > > > > That still leaves the following unbuildable with > > > > CONFIG_SPL_FIT_GENERATOR =3D "arch/arm/mach-imx/mkimage_fit_atf.sh": > > > > > > configs/cgtqmx8_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch/arm/mach-imx= /mkimage_fit_atf.sh" > > > > > > configs/imx8mm-icore-mx8mm-ctouch2_defconfig:CONFIG_SPL_FIT_GENERATOR= =3D"arch/arm/mach-imx/mkimage_fit_atf.sh" > > > > > > configs/imx8mm-icore-mx8mm-edimm2.2_defconfig:CONFIG_SPL_FIT_GENERATOR= =3D"arch/arm/mach-imx/mkimage_fit_atf.sh" > > > > > > configs/imx8mm_beacon_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch/arm/ma= ch-imx/mkimage_fit_atf.sh" > > > > > > configs/imx8mn_beacon_2g_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch/arm= /mach-imx/mkimage_fit_atf.sh" > > > > > > configs/imx8mn_beacon_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch/arm/ma= ch-imx/mkimage_fit_atf.sh" > > > > > > configs/imx8qm_rom7720_a1_4G_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch= /arm/mach-imx/mkimage_fit_atf.sh" > > > > > > > > Tim > > > > [1] https://patchwork.ozlabs.org/project/uboot/list/?series=3D265765 > > > > [2] https://patchwork.ozlabs.org/project/uboot/list/?series=3D268380 > > > > [3] https://patchwork.ozlabs.org/project/uboot/list/?series=3D261640 > > > > [4] https://patchwork.ozlabs.org/project/uboot/list/?series=3D261822 > > > > > > > > > > Tom, > > > > > > I'm not familiar with the U-boot CI tool. > > > > It's at https://u-boot.readthedocs.io/en/latest/develop/ci_testing.html > > (and in-tree under doc/develop/ci_testing.rst). > > > > > Is it a show-stopper that it > > > does not build for boards using binman for release? From what you > > > mentioned in another thread it was never building the flash.bin target > > > for the boards using the FIT generator anyway. > > > > Yes, breaking CI is a ship-stopper. That all of these boards were not > > previously building the final image as part of "all" is a problem. > > > > So, here's what I'm at right now. I've grabbed Heiko's patch. > > Everything is currently visible at > > > > https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-up= dates/ > > and with this, we get some boards building and complaining as expected: > > aarch64: w+ imx8mn_evk > > +(imx8mn_evk) Image 'main-section' is missing external blobs and is > > non-functional: blob-ext@1 > > blob-ext@2 blob-ext@3 blob-ext@4 > > +(imx8mn_evk) Image 'main-section' is missing external blobs and is > > non-functional: blob-ext > > +(imx8mn_evk) > > +(imx8mn_evk) Some images are invalid > > > > But others are: > > aarch64: + imx8mn_beacon_2g > > +(imx8mn_beacon_2g) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D WARNING =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > +(imx8mn_beacon_2g) This board uses CONFIG_SPL_FIT_GENERATOR. Please > > migrate > > +(imx8mn_beacon_2g) to binman instead, to avoid the proliferation of > > +(imx8mn_beacon_2g) arch-specific scripts with no tests. > > +(imx8mn_beacon_2g) =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 > > +(imx8mn_beacon_2g) Image 'main-section' is missing external blobs and = is > > non-functional: blob- > > ext@1 blob-ext@2 blob-ext@3 blob-ext@4 > > +(imx8mn_beacon_2g) binman: Error 1 running 'mkimage -d > > ./mkimage.spl.mkimage -n spl/u-boot-spl > > .cfgout -T imx8mimage -e 0x912000 ./mkimage-out.spl.mkimage': > > spl/u-boot-spl-ddr.bin: Can't ope > > n: No such file or directory > > +(imx8mn_beacon_2g) > > +(imx8mn_beacon_2g) make[1]: *** [Makefile:1088: all] Error 1 > > +(imx8mn_beacon_2g) make: *** [Makefile:177: sub-make] Error 2 > > >=20 > The beacon boards are mine. I can work on this one today. Do I just grab > the binman updates and apply it to master and fix it from that starting > point? So, yes, grabbing the series from the above link and applying it on top of master, and making builds work with fake binaries would be very helpful. As best I can tell there's still something missing with making fake blobs link and not fail. For example, imx8mm_venice is part of the series above but still fails with 'make BINMAN_FAKE_EXT_BLOBS=3D1 ...': Image 'main-section:u-boot-spl-ddr' has faked external blobs and is non-fun= ctional: lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_p= mu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin Image 'main-section' is missing external blobs and is non-functional: atf_b= lob blob-ext Wrote map file './imx-boot.map' to show errors binman: Node '/binman/imx-boot/blob-ext@1': Offset 0x0 (0) overlaps with pr= evious entry '/binman/imx-boot/uboot' ending at 0x1aee08 (1764872) And that last error is the real problem. --=20 Tom --owfka6xPfXVq+OmA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmHYhacACgkQFHw5/5Y0 tyx2tgv+Nv/ASaduH3753huFEi0zdFsm9ihjs2tsDUYJBGnk2bYlqaooj14XZ83e cXbbqBqVtPLuP6s+2MuSY5OattKEdShKqYG/vihx1ZqIjt4GMSsUUJvto9H4JzlL cs5anWbr4APb22w5D62z6w0fdUvi02A5luK6mJKqrYfm+nFWCK/oGyhS260OtWnx 0W2m6+9c8Ow2wE6qvU2NP7C9ZI70WfL9I0G38bRz/F1TpdOdh1Gg/4NMQ5E6T2E+ I1BdQsE5UlEI5aeKp048HgqD5VsX6y/f3BeQizqnn1ok00FJRY/hX+/S/PQemL9X tlpe+IjyYEeAeSjL6pxSHrjSwukqj/C/15mhUKHc2CqtRT4zikNKwMSPYj9IIBBu 6iTpT6vN0BeukEYKH+6ut4ecLGt/8GNLTu5+b1N1eJ6/tRE/Qtx+SjZLlmo3paGC iP3NrkXTn3rZkTDntYtUZN4t55zwMMBlJl0vRqpmMoJd9lEbPM+hVTJs2bV76eQK 9GERLB6q =KUlN -----END PGP SIGNATURE----- --owfka6xPfXVq+OmA--