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 9885FC77B7E for ; Tue, 2 May 2023 16:19:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E33BF84745; Tue, 2 May 2023 18:19:32 +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="SW1MPizm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B78884730; Tue, 2 May 2023 18:19:31 +0200 (CEST) Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) (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 C44B18470D for ; Tue, 2 May 2023 18:19:28 +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-pl1-x636.google.com with SMTP id d9443c01a7336-1aad5245571so25739775ad.1 for ; Tue, 02 May 2023 09:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1683044367; x=1685636367; 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=DGHiWLKtj9qW35mG4dyiptTcmsaSmUr8FSBf32dOw2w=; b=SW1MPizmgNg0gr4rv5TFygI1pyAveCssnoRZ1sTBbDaVcOEAYH41QBbFwW/szqvZFl TnKQopD5W4FwI/QOutCiglDwwstbezf57SIBcZ5e/0HC+QkA8ft6vzXpn+I9rHV7GUps mA/SSeL+A6aS0VRyiDmcL9d6glTM9365DryD5H6/ACg+nFWSwHwQl+DwC3qxbAYm5iPM LXnjypTR6zpQr11ouylcSpjkTSrd4eT/njfZt4MMpsJ2w78OX0iNpscBTC1HC9Ts1nWi CALgNZ6CITOkBSB1hBFvmC/me/f+20Z9spdLq8Ipzq/TPEuqAAoYYQEQJ+a0Uh6IR167 3N2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683044367; x=1685636367; 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=DGHiWLKtj9qW35mG4dyiptTcmsaSmUr8FSBf32dOw2w=; b=biOh4K8NzAoTEjiNvG/b3C/Y2D5xOM6bGVgvT1Oe/EIJm5QUV4L2gh5GN482qmL+MH /+saB+DJHSl9nh3UZ73viUqmNXoOkwTq6X6knru1x7WAk33ohljAMm4ghV6Pbj9Pmv6x nc1vFxdDE1XekvXnLkzlT3RNVYHa86PD0CXzzDUNlpEB/iHCEWQj09O4DMKLAIdPfKRl ek9zYQdLHeXvgq4Ri6THdLdVfjp+qG+PweK/WlnGnpYZSj1djL7VZzqUMCss1gLisGTY S0CZBxwiEOFi3UBQeNlrRwLPgWzqRQTfVQDjPXlwAVuDtRGa6gfLTwPaFnaduUp4H+me XnHQ== X-Gm-Message-State: AC+VfDy+RlEslb6xG8p4Cu+YlaV5viMCAJyh/c3fnke2LMkxq/Z4M4eF 7KXuWhEL7HLRQpkiKMLRvknbKQ== X-Google-Smtp-Source: ACHHUZ4pa4oj6p0WDHJzgY2PPpzB6j25cjPfCZuv7reZ6g+PeiKn8aDRFUCWM5qYh6+4Oq6W2gRxVg== X-Received: by 2002:a17:902:ec8a:b0:1a2:afdd:8476 with SMTP id x10-20020a170902ec8a00b001a2afdd8476mr22284813plg.2.1683044367209; Tue, 02 May 2023 09:19:27 -0700 (PDT) Received: from mchitale-vm.. ([106.195.4.219]) by smtp.googlemail.com with ESMTPSA id c11-20020a170902724b00b001a527761c31sm20052465pll.79.2023.05.02.09.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 May 2023 09:19:26 -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 v2 3/4] spl: Support loading a FIT from ext FS Date: Tue, 2 May 2023 21:49:01 +0530 Message-Id: <20230502161902.1339861-4-mchitale@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230502161902.1339861-1-mchitale@ventanamicro.com> References: <20230502161902.1339861-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 2bf3434439..8593aed069 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