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 A4F35C433F5 for ; Wed, 6 Apr 2022 05:32:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8366D83C6C; Wed, 6 Apr 2022 07:32:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649223162; bh=BS2ycAU8vpPtVvsgylnigJUmUlupN2+p4avRgBkP+Aw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=FPx2ExjTF6q64i4wk2FsHiTIt6XPEGNqVIzawsT8ldfKmDx71PU2mGi6KKfnKls/5 /HsiNuIYLaXzzbiFkCdG7GmLn1+0c3nT9SQ9mfkqwfUYq97i+i/2q+gVclDbb/3rCj GtzoJfZynq9fkjExjXvdT5c6vAoL14AmOQZ7g2Vc3WbdPjGHz8soh/xA6QSUkNp8he 6aHqC/VbBo/4TCskhixYCpn5uIZSq9O8+sd7KxmmPw2dnJIkdfgvc7iEIGcS2usuRb 9yrISz2IuuIa7AFxan7U5somQtc0jAFfEWe69dqrCB7mwq2g0GzGxlX7FE0rUNoDRv SZrMou/hEo+KA== Received: by phobos.denx.de (Postfix, from userid 109) id EC69A83C76; Wed, 6 Apr 2022 07:32:39 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:1::465:107]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F183B83C67 for ; Wed, 6 Apr 2022 07:32:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (unknown [91.198.250.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4KYCns3JlZz9sRB; Wed, 6 Apr 2022 07:32:33 +0200 (CEST) Message-ID: Date: Wed, 6 Apr 2022 07:32:25 +0200 MIME-Version: 1.0 Subject: Re: [RFC PATCH 3/7] spl: Convert fat to spl_load Content-Language: en-US To: Sean Anderson , Simon Glass Cc: =?UTF-8?Q?Marek_Beh=c3=ban?= , u-boot@lists.denx.de, Marek Vasut , =?UTF-8?Q?Pali_Roh=c3=a1r?= References: <20220401190405.1932697-1-sean.anderson@seco.com> <20220401190405.1932697-4-sean.anderson@seco.com> From: Stefan Roese In-Reply-To: <20220401190405.1932697-4-sean.anderson@seco.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean On 4/1/22 21:04, Sean Anderson wrote: > This converts the fat loader to use spl_load. > > Signed-off-by: Sean Anderson Reviewed-by: Stefan Roese Thanks, Stefan > --- > > common/spl/spl_fat.c | 36 ++++++------------------------------ > 1 file changed, 6 insertions(+), 30 deletions(-) > > diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c > index 5b270541fc..c092eb3481 100644 > --- a/common/spl/spl_fat.c > +++ b/common/spl/spl_fat.c > @@ -61,6 +61,11 @@ int spl_load_image_fat(struct spl_image_info *spl_image, > { > int err; > struct image_header *header; > + struct spl_load_info load = { > + .read = spl_fit_read, > + .bl_len = 1, > + .filename = filename, > + }; > > err = spl_register_fat_device(block_dev, partition); > if (err) > @@ -72,36 +77,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image, > if (err <= 0) > goto end; > > - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) && > - image_get_magic(header) == FDT_MAGIC) { > - err = file_fat_read(filename, (void *)CONFIG_SYS_LOAD_ADDR, 0); > - if (err <= 0) > - goto end; > - err = spl_parse_image_header(spl_image, bootdev, > - (struct image_header *)CONFIG_SYS_LOAD_ADDR); > - if (err == -EAGAIN) > - return err; > - if (err == 0) > - err = 1; > - } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && > - image_get_magic(header) == FDT_MAGIC) { > - struct spl_load_info load; > - > - debug("Found FIT\n"); > - load.read = spl_fit_read; > - load.bl_len = 1; > - load.filename = (void *)filename; > - load.priv = NULL; > - > - return spl_load_simple_fit(spl_image, &load, 0, header); > - } else { > - err = spl_parse_image_header(spl_image, bootdev, header); > - if (err) > - goto end; > - > - err = file_fat_read(filename, > - (u8 *)(uintptr_t)spl_image->load_addr, 0); > - } > + err = spl_load(spl_image, bootdev, &load, header, err, 0); > > end: > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT Viele Grüße, Stefan Roese -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de