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 532CCC433F5 for ; Fri, 7 Jan 2022 17:38:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D871983728; Fri, 7 Jan 2022 18:37:59 +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="ObTLX501"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 70F7983737; Fri, 7 Jan 2022 18:37: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 C2EFA812C3 for ; Fri, 7 Jan 2022 18:37: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 kd9so6092402qvb.11 for ; Fri, 07 Jan 2022 09:37: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=4OJk1H+tJcSJA26GeR+NyXc3umYrYluD4GdtQ+VjVNo=; b=ObTLX501VesbjWkaQEksLZkqKzzXlHSo5AOzDrgViCGTxVynv1tHPNi36k5GGuyhg1 76bwPF1qvfXhqWE3MuXAYh0hKftlTqNgtizg91gd9BYPAkjvUTWqieLVW6Vyz6MU7JQm Q8dmHL/0KxvTbh7Amb9yJILdUZ5z5MOytkT38= 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=4OJk1H+tJcSJA26GeR+NyXc3umYrYluD4GdtQ+VjVNo=; b=KwGBMKeFq92UJXjI3ANAyIIzFbXaDfVaXvtGWe79IQEmmMsWwh6NyaWnjp3lcD+Oy+ YwlZ8tGd+Bmebw1zpGfWJGYrvSEC3sujPY1qjSkgbsuYGoy1UqZyWv7avLDmUNyXOSrj NLSwLGd7pEuuc2KxcMGp7DM8ehn7xudnIPTJ9oarCvPqzbQOGEjaNozbIDNimMwHVydM D1T5rWLr3MCcaoipJMrWbSh8m3tracD0QTCxe68QuPob5kVwXSQgwNZbLWLwzsv0CNU7 x0xM2ZCfETgPIGQMtoGCzN+IrpReGtPcf2a1J8eXoqmtdx0AUTdle88+oke0Ud2H1bFH qiVQ== X-Gm-Message-State: AOAM531+xpAGaaEc8WtRu+qGwNcI5NiPebb/AbK31vueSCPk1hyNxZJk Bm1pPpJWJjY27vWzsa5+gZN3ow== X-Google-Smtp-Source: ABdhPJzazutkVGWWGbGXkSYmP2cMxJkamJOtj9F0aJ22KIxCgR6R3pAbu7Jgz870G4eDhRSeuSCqVg== X-Received: by 2002:a05:6214:21e8:: with SMTP id p8mr59267132qvj.99.1641577073573; Fri, 07 Jan 2022 09:37: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 bm12sm2638003qkb.86.2022.01.07.09.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 09:37:52 -0800 (PST) Date: Fri, 7 Jan 2022 12:37:51 -0500 From: Tom Rini To: Tim Harvey Cc: ZHIZHIKIN Andrey , "u-boot@lists.denx.de" Subject: Re: [PATCH] Revert "tree: imx: remove old fit generator script" Message-ID: <20220107173751.GE2773246@bill-the-cat> References: <20220106185133.2375747-1-trini@konsulko.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1G2DwoQyerttexeH" 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 --1G2DwoQyerttexeH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 Rini > > > > 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 th= at > > > > 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 curren= tly > > > > 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 wou= ld > > > generate ITS with '@' symbols which are not compatible with mkimage d= ue > > > to CVE-2021-27138. This revert should be complemented with the fix 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 exit c= ode 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 stopped > > worrying about it because I thought we were moving to binman for this > > 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 dir= ectory > > 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 what > > else has changed that now causes that to not work. > > > > As Tom pointed out in another thread these build failures did not get > > 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 conversions? > > > > 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 build > > 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 > > >=20 > Tom, >=20 > 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-update= s/ 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-fun= ctional: blob-ext@1 blob-ext@2 blob-ext@3 blob-ext@4 +(imx8mn_evk) Image 'main-section' is missing external blobs and is non-fun= ctional: 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 n= on-functional: blob- ext@1 blob-ext@2 blob-ext@3 blob-ext@4 +(imx8mn_beacon_2g) binman: Error 1 running 'mkimage -d ./mkimage.spl.mkima= ge -n spl/u-boot-spl =2Ecfgout -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 and that's the problem to fix still, that ddr bin being faked out, in CI. I think I see how to do that however, and I'm going to test that out locally and then shoot this at CI and see what happens. --=20 Tom --1G2DwoQyerttexeH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmHYem8ACgkQFHw5/5Y0 tyx0KgwAsYQ7RgemAOde3YM21QjojMSNvGbOvFlLklG4EHfOHkpoIHqBT05obLUq 2pFi2DnQmT4d5G0zn2F7l6VhlZ5IDdcuOxhNZmGAIaFntfC0CA9b3gNnfEP14b9I dr4CeoG8AJaopoB5xa0j0NL1ozAvnyUktDil+7zEeCXYyqJh/uUGj8toXf0/ox0T /9qg8f768UZ59cz7mUnmY2dISlsoLUxjtR4y7MqhwKzSlR4Uk/j0lpHLW9paQtoB pYeKy4L5+vlzYK3sG91wY0td70DXa+981wsMWP4f/P3c7r72jfAvSa4kPTN/KzDP eetjdYLb4VjCALm5yqBlutwrUeS9KOpt0Hgz9UCfac8xPvVBvlGvf1CraV01/VWN hSPRkWANRRTja9XVqq1e5kjUW3vndYcwnKsjSkFOCNeJ7Wh5hMxa55SdJB1DicO+ KFQ3caMdiW2pKWFEiY+/othfybL//8/ODp6s7dSai87ipkFiN5x0sxCS1mp05/Kv 7DsA7o8l =pYlh -----END PGP SIGNATURE----- --1G2DwoQyerttexeH--