From mboxrd@z Thu Jan 1 00:00:00 1970 From: Emmanuel Vadot Date: Sat, 27 Apr 2019 14:46:55 +0200 Subject: [U-Boot] [PATCH] rockchip: make_fit_atf: Use BL31 environ variable for file location In-Reply-To: References: <20190205105428.39890-1-manu@freebsd.org> Message-ID: <20190427144655.3ffb4ec1867a2c782b99364c@bidouilliste.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Jagan, On Sun, 21 Apr 2019 22:42:45 +0530 Jagan Teki wrote: > On Tue, Feb 5, 2019 at 4:24 PM Emmanuel Vadot wrote: > > > > Other make_fit script (like imx or sunxi) use the BL31 environment > > variable to indicate the location of the file. > > Also do that for rockchip so we don't need to copy the file in the source > > directory. > > > > Signed-off-by: Emmanuel Vadot > > --- > > arch/arm/mach-rockchip/make_fit_atf.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py > > index d1faff1957..7bf58e3dd1 100755 > > --- a/arch/arm/mach-rockchip/make_fit_atf.py > > +++ b/arch/arm/mach-rockchip/make_fit_atf.py > > @@ -194,7 +194,7 @@ def get_bl31_segments_info(bl31_file_name): > > > > def main(): > > uboot_elf="./u-boot" > > - bl31_elf="./bl31.elf" > > + bl31_elf=os.getenv("BL31", "./bl31.elf") > > Have similar change on my repo. > > Better through warning for non BL31 like > > if "BL31ELF" in os.environ: > bl31_elf=os.getenv("BL31ELF"); > else: > sys.exit("ERROR: Please export BL31ELF file, check > board/rockchip/evb_rk3399/README) I didn't error for the same reason we don't on Allwinner, CI don't copy this file as part of the test. Yes this does result in a non-working u-boot but the goal of thoses test is just to compile. mksunxi_fit_atf.sh prints a warning, maybe I should just do the same ? Phillipp, what's your view on this ? > And BL31ELF would be proper env than BL31 since rockchip build would > require elf and other one has bin, IMHO. This change is fine with me. -- Emmanuel Vadot