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 54786C433F5 for ; Fri, 7 Jan 2022 20:27:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 553AE830CA; Fri, 7 Jan 2022 21:27:09 +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="qdrvEm5N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1D52B830C3; Fri, 7 Jan 2022 21:27:08 +0100 (CET) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 CAAD9830CA for ; Fri, 7 Jan 2022 21:27:03 +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-qk1-x735.google.com with SMTP id b85so7134097qkc.1 for ; Fri, 07 Jan 2022 12:27:03 -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=PHI3MEASUhGoXxlx7pvLCFSUkpoyHOXs4jAxOZ1b47M=; b=qdrvEm5Nmkz3FdOCopovfDJ54ymfDFb8Ja0tzbNpR4qSnEyKfEiQ1rsl/HdJ/m23C4 Om16LSiVbbeB586Tw82VaoC4MDyS3lUIBtzVsBaO0nedn1DQYOzJdbYnhPjXgQX5qgwO QDHDxSuNTlKcAZ8PCbRPb20LZ+G37tTOWh7Uo= 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=PHI3MEASUhGoXxlx7pvLCFSUkpoyHOXs4jAxOZ1b47M=; b=sCsTbbInaobodEiAt0wvKwArnAOU0RHRPPWNMVl1lrMJnwedrf8r7iDYsq1dPWP2iB +oS9gCMPHrYftkx+YBwX5VUDoeOHcjcsPjhVFMgfzOk2yBFKiDryyFbOW0yEaDJQz81Q onw7GO73+keSa4sytyDX92x5cpJ9kBbSi2GpV9I/pSz36irSHvvlvHmsu0P7YftCQsDU CEe2T1gJs5RZ9t7xmzLS/strMgIWmHFSQ102ypw6bBmeJT+VhFP4TscI0IR92Y9TwpUF njoh95HrWQ2ZCcgWRg79EaLijonll/5rHiFbR+ybdX0VZB8yL+fAOSmJATIEvJmpH2Ka 8VFQ== X-Gm-Message-State: AOAM531GlrjMFmOCd/LszqonyZjZf2ck0JxSfDyIuc20DYYHlChpHWuk j6Y82Q9ZtxtldDV+v936NT1SRw== X-Google-Smtp-Source: ABdhPJxMC6BmQJ7YRWM2Cy40TD4ipyHC3rYKFg1ZB0r3t6GP9BduhgRrW4bes3T8Ta4HziKF3M5bMA== X-Received: by 2002:a05:620a:1588:: with SMTP id d8mr6119954qkk.174.1641587222472; Fri, 07 Jan 2022 12:27:02 -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 8sm4441016qtz.28.2022.01.07.12.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 12:27:01 -0800 (PST) Date: Fri, 7 Jan 2022 15:27:00 -0500 From: Tom Rini To: Tim Harvey Cc: Adam Ford , ZHIZHIKIN Andrey , "u-boot@lists.denx.de" , Marcel Ziswiler Subject: Re: [PATCH] Revert "tree: imx: remove old fit generator script" Message-ID: <20220107202700.GH2773246@bill-the-cat> References: <20220106185133.2375747-1-trini@konsulko.com> <20220107173751.GE2773246@bill-the-cat> <20220107182550.GF2773246@bill-the-cat> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Zjez/VanaHVKaoe1" 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 --Zjez/VanaHVKaoe1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 07, 2022 at 12:24:57PM -0800, Tim Harvey wrote: > On Fri, Jan 7, 2022 at 12:08 PM Adam Ford wrote: > > > > > > > > On Fri, Jan 7, 2022 at 12:25 PM Tom Rini wrote: > >> > >> 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: > >> > > >> > > 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 T= om 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 generat= or > >> > > script" > >> > > > > > > > >> > > > > > > This reverts commit d9a6f0eed66a39206b13513ec914f14084c3bb= 73. > >> > > > > > > > >> > > > > > > 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 conve= rt > >> > > currently > >> > > > > > > broken platforms to use binman instead. So, bring back th= is > >> > > script now > >> > > > > > > and remove it again for real after the release. > >> > > > > > > >> > > > > > Please note that this might not work, as the FIT generator s= cript > >> > > would > >> > > > > > generate ITS with '@' symbols which are not compatible with = mkimage > >> > > due > >> > > > > > to CVE-2021-27138. This revert should be complemented with t= he 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/u= boot@1: > >> > > > > node has a unit name, but no reg property > >> > > > > u-boot.its:16.9-21.5: Warning (unit_address_vs_reg): /images/f= dt@1: > >> > > > > node has a unit name, but no reg property > >> > > > > u-boot.its:22.9-27.5: Warning (unit_address_vs_reg): /images/f= dt@2: > >> > > > > node has a unit name, but no reg property > >> > > > > u-boot.its:28.9-33.5: Warning (unit_address_vs_reg): /images/f= dt@3: > >> > > > > node has a unit name, but no reg property > >> > > > > u-boot.its:34.9-39.5: Warning (unit_address_vs_reg): /images/f= dt@4: > >> > > > > node has a unit name, but no reg property > >> > > > > u-boot.its:40.9-45.5: Warning (unit_address_vs_reg): /images/f= dt@5: > >> > > > > node has a unit name, but no reg property > >> > > > > u-boot.its:46.9-55.5: Warning (unit_address_vs_reg): /images/a= tf@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 pro= perty > >> > > > > u-boot.its:66.12-71.5: Warning (unit_address_vs_reg): > >> > > > > /configurations/config@2: node has a unit name, but no reg pro= perty > >> > > > > u-boot.its:72.12-77.5: Warning (unit_address_vs_reg): > >> > > > > /configurations/config@3: node has a unit name, but no reg pro= perty > >> > > > > u-boot.its:78.12-83.5: Warning (unit_address_vs_reg): > >> > > > > /configurations/config@4: node has a unit name, but no reg pro= perty > >> > > > > u-boot.its:84.12-89.5: Warning (unit_address_vs_reg): > >> > > > > /configurations/config@5: node has a unit name, but no reg pro= perty > >> > > > > ./tools/mkimage: verify_header failed for FIT Image support wi= th exit > >> > > 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 = stopped > >> > > > > worrying about it because I thought we were moving to binman f= or 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 fi= le 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 resolv= ed the > >> > > > > building issue when using the FIT generator but I also don't k= now 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 conv= ersions? > >> > > > > > >> > > > > I know that my series has been reviewed by Marcel [1] and as f= ar 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 bin= man [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_at= f.sh": > >> > > > > > >> > > configs/cgtqmx8_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch/arm/mac= h-imx/mkimage_fit_atf.sh" > >> > > > > > >> > > configs/imx8mm-icore-mx8mm-ctouch2_defconfig:CONFIG_SPL_FIT_GENERA= TOR=3D"arch/arm/mach-imx/mkimage_fit_atf.sh" > >> > > > > > >> > > configs/imx8mm-icore-mx8mm-edimm2.2_defconfig:CONFIG_SPL_FIT_GENER= ATOR=3D"arch/arm/mach-imx/mkimage_fit_atf.sh" > >> > > > > > >> > > configs/imx8mm_beacon_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch/a= rm/mach-imx/mkimage_fit_atf.sh" > >> > > > > > >> > > configs/imx8mn_beacon_2g_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arc= h/arm/mach-imx/mkimage_fit_atf.sh" > >> > > > > > >> > > configs/imx8mn_beacon_defconfig:CONFIG_SPL_FIT_GENERATOR=3D"arch/a= rm/mach-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=3D= 265765 > >> > > > > [2] https://patchwork.ozlabs.org/project/uboot/list/?series=3D= 268380 > >> > > > > [3] https://patchwork.ozlabs.org/project/uboot/list/?series=3D= 261640 > >> > > > > [4] https://patchwork.ozlabs.org/project/uboot/list/?series=3D= 261822 > >> > > > > > >> > > > > >> > > > Tom, > >> > > > > >> > > > I'm not familiar with the U-boot CI tool. > >> > > > >> > > It's at https://u-boot.readthedocs.io/en/latest/develop/ci_testing= =2Ehtml > >> > > (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-binm= an-updates/ > >> > > and with this, we get some boards building and complaining as expe= cted: > >> > > 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. Plea= se > >> > > 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 > >> > > > >> > > >> > The beacon boards are mine. I can work on this one today. Do I jus= t grab > >> > the binman updates and apply it to master and fix it from that start= ing > >> > 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 maki= ng > >> fake blobs link and not fail. For example, imx8mm_venice is part of t= he > >> 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 no= n-functional: lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpd= dr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin > >> Image 'main-section' is missing external blobs and is non-functional: = atf_blob blob-ext > >> Wrote map file './imx-boot.map' to show errors > >> binman: Node '/binman/imx-boot/blob-ext@1': Offset 0x0 (0) overlaps wi= th previous entry '/binman/imx-boot/uboot' ending at 0x1aee08 (1764872) > >> > > > > From what I can tell looking at the imx8mm_venice board is that the imx= 8mm-u-boot.dtsi has the binman nodes to build the image, but arch/arm/dts/i= mx8mm-venice-u-boot.dtsi duplicates that work, so there are two copies tryi= ng to occupy the same space. Deleting the &binman node from the venice-u-b= oot.dtsi file appears to make the problem go away, and binman is still maki= ng the image. > > >=20 > Adam, >=20 > I don't quite follow. I don't see any binman nodes in > arch/arm/dts/imx8mm-u-boot.dtsi. >=20 > I know that Marcel submitted a patch that added them (and I'm not sure > if he added them yet in a way that was compatible with multiple fdt's) > but this hasn't been merged yet so I don't see any duplicate binman > nodes for venice. Right, so this is with https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-update= s/ applied and I did have to manually apply Marcel's 4/7 and 7/7, so maybe I mismerged something there too? The tree is also at https://github.com/trini/u-boot/tree/WIP/2022-01-07-imx8-and-buildman-updat= es --=20 Tom --Zjez/VanaHVKaoe1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmHYogwACgkQFHw5/5Y0 tyx1SAv/RVZYF50u69GjdITX9oImr54wzT3l1T0WzFkFQypvx9RYW1JJpsAB9kZU lTF9M2+264vSIMfr0fNX2WA0t8tX02zGFVkz+eNmPNqt0Se40m0KXhEwylj5dWQh 61r5gLwJZRx2AoA4JkKoqQYHKBLViN4GgmPfVQhRqRyLGbDxd5l58LjkSi7d9Ksj fN46xpx7eSXqYsH73J28q3+BYDtC8Dug+Tr+SnH1w4V9gV4s5acp1F8HjGKpo5Xa xZeOMDwx+/jUHH+tzTCjV/6H2dLrWiSy5deP/ZyJXpKalKbYuvL1s7MMeqGGkY9E 5Gc5Rhj6nOAQ23alFD71CHo59mEQfU6fQFYGJL65nQFk+GQkolR9xyPbfhgy3IAx nyo5Zvd4i7UdKtCPniRf/pu3n0oTPByVzb/U/+5EO0Ldk3GnnVE20nVNNArViXoW nJpYbNxc+DdKba3Mu3R/HvaGEE2YMau+SOstgqo2K81maJn1NakqMWunZEE3ljhl YwHlyuNs =1b1f -----END PGP SIGNATURE----- --Zjez/VanaHVKaoe1--