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 CE6D1C7EE21 for ; Thu, 4 May 2023 09:54:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C2BC2857B5; Thu, 4 May 2023 11:53:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="plI6zXaF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9368884797; Thu, 4 May 2023 11:53:53 +0200 (CEST) Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) (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 ED92284797 for ; Thu, 4 May 2023 11:53:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mchitale@ventanamicro.com Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-64382139ebaso218478b3a.2 for ; Thu, 04 May 2023 02:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1683194029; x=1685786029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZEvHc1J4eSrz/1BFgcbIT2e2BtxVUK3OptaszyWlypM=; b=plI6zXaFL5JAsHqoGr3aFrZf40O2ECJlxqL+xqODl5RtZVggI1oWBWGdWfdOe46LUr Ae/DAWGQ/Z1erOsOuwySuw/PJrutHBsGJYuNKJq3By9NTzLmCuO71JrqoQY5c+iMBb9C 8o9zwvpek0n9ydapX98TSLRq4J48eqLZX9ZW/IDx0tflkWaF269ygGd05a77WJ++c4l3 aMPcUdrgmgohMszHFnVkg77IDNOQdi5zbBFx2EUYNCPUeAHO6rG1gzV/ptrjxd2/TkWc zuCTYEGYc9mQRJmi2I0x+5bfc8b04ya6QD2ISAMPZ9yg40uyoB6e7N7e6VJ2ThgHil2x xkGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683194029; x=1685786029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZEvHc1J4eSrz/1BFgcbIT2e2BtxVUK3OptaszyWlypM=; b=CTF7DD3H5azkyUSTRCGf5zQMlq1z/oWXsELzcKVhNIKn3eEHMw+sppBwAxsuCWl/6P rgnv5HYfjWjbNBmWKw8npn3iMrHHGQmFjj//XoxUXl5YgA9oWhuoLKVQATSLbDWxqCve ViiwYSr3DHQ0y/HaWAee6cOv6fExX4FcP6ArxS3kLW4K3chsS4tV73HPp7Cnnt68K/Br 7zaKNd8ZviR+rsdktfbfxPA7YMCMKNSub+qcNcDHcEoVhB0dLotUpLn48/HVud16jmzi R9/RMekW6o9PPGUyrVZshbyGDiU9jMlSleK3Z8EazGSijC0r260PKcOb8bjqukgPlYiG zyOw== X-Gm-Message-State: AC+VfDw050o1vKh1dkVMGOIMVWdk4iTCESrCGaNkfa1xNp4V1s9wzoyM s+IOErBasKjPd+hgFJDVxc3t/Q== X-Google-Smtp-Source: ACHHUZ6EkOJyLOUC1CwaH7dOKXXbeSywoL+trPW/VIVrq96TSvN2eZfI8bLihIX6iqksaooXe0TP/Q== X-Received: by 2002:a05:6a20:1443:b0:f2:dc4d:935d with SMTP id a3-20020a056a20144300b000f2dc4d935dmr2119015pzi.18.1683194029317; Thu, 04 May 2023 02:53:49 -0700 (PDT) Received: from mchitale-vm.. ([103.97.165.210]) by smtp.googlemail.com with ESMTPSA id w18-20020a63d752000000b0051b8172fa68sm21746267pgi.38.2023.05.04.02.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 02:53:48 -0700 (PDT) From: Mayuresh Chitale To: Bin Meng , Simon Glass Cc: Mayuresh Chitale , u-boot@lists.denx.de, Heinrich Schuchardt , Rick Chen , Leo Subject: [PATCH v3 4/5] spl: Support loading a FIT from ext FS Date: Thu, 4 May 2023 15:23:26 +0530 Message-Id: <20230504095327.2791676-5-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230504095327.2791676-1-mchitale@ventanamicro.com> References: <20230504095327.2791676-1-mchitale@ventanamicro.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Detect a FIT when loading from an ext File system and handle it using the FIT SPL support. Signed-off-by: Mayuresh Chitale --- common/spl/spl_ext.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index f117c630bf..7b771c41e9 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -8,6 +8,26 @@ #include #include #include +#include + +static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset, + ulong size, void *buf) +{ + loff_t filelen = (loff_t)load->priv, actlen; + char *filename = (char *)load->filename; + int ret; + + ret = ext4fs_read(buf, file_offset, filelen, &actlen); + if (ret < 0) { + if (IS_ENABLED(CONFIG_SPL_LIBCOMMON_SUPPORT)) { + printf("%s: error reading image %s, err - %d\n", + __func__, filename, ret); + } + return ret; + } + + return actlen; +} int spl_load_image_ext(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, @@ -47,6 +67,19 @@ int spl_load_image_ext(struct spl_image_info *spl_image, goto end; } + 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 = (void *)filelen; + + return spl_load_simple_fit(spl_image, &load, 0, header); + } + err = spl_parse_image_header(spl_image, bootdev, header); if (err < 0) { puts("spl: ext: failed to parse image header\n"); -- 2.34.1