Message ID | 20210315173656.29.I33da43566886210a8221a585ddc7ff5d3d395a19@changeid |
---|---|
State | Accepted |
Commit | b8bcccedac91b8551bf00af724d6a5d45f47bd0f |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=GHyeSB9d; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DzPY86Tgmz9sR4 for <incoming@patchwork.ozlabs.org>; Mon, 15 Mar 2021 16:07:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B581D82ADA; Mon, 15 Mar 2021 06:03:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="GHyeSB9d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B145882AAF; Mon, 15 Mar 2021 06:02:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) (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 5C8B282AA5 for <u-boot@lists.denx.de>; Mon, 15 Mar 2021 06:02:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-pf1-x42d.google.com with SMTP id 18so5825583pfo.6 for <u-boot@lists.denx.de>; Sun, 14 Mar 2021 22:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d7x59w/pX17h/SJ0k66blg6mKOzZp7H8NW7BvR12dG4=; b=GHyeSB9dAyQJzry3j2AfSn8SOtmXR+XfyEam39bgWlE+i2ATk0NBA5ZwES4y44fSpQ Cl2WvAB3tig0fgosxR1+xoHwoKhMTvew65qsNMNbj7ids0Nv0mh7GJOmsVDHhEgGr4gs ZrF7+0tWIYkZrUxGsRmSMXOBMOER4lXhD//fM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d7x59w/pX17h/SJ0k66blg6mKOzZp7H8NW7BvR12dG4=; b=tsgdwj6r7Bhy9OEXLrEWODoXl7VNjru7wgNEC7PuYXkJ5aDv3cKZh6foqBsmetlg3P SrPDd42PeIIak2LjqKeDOAPgbdaFvkvWiFL1tRwxfKlK5did9KSgzz+793i3teTZmOc6 63OFTGRuemZQUSauheMtBSoCQPJwqr4speCQJ8+YRudFrMT3xybpxc0PGPfUYwdUKj89 socHsHQLx9ouE83XqBuSK+/ORPLiUDXq3Co1MVI9l60/jWFQpySw/jnkiEMH2PUFcYsD mLTNe+ZbRGhUiwxffREER9FtYPjys5vjueLc8vxLTL6jxH6eHaUfvTAjf/qM3JtveRWy zY5g== X-Gm-Message-State: AOAM533/G2U4QuI6DBcTI8L15m/lY/JlDBXsKcI40GKZZuEkncL5NVDb HFGYd8O1EMfd53pv0a8BsBdr6bN5zj7AWBY/ X-Google-Smtp-Source: ABdhPJxThj2zYeLsypd0uNebiLqfWo51UwukiJNwc1ETVPht0cBwyLfi3XNc5xZ7Jjxfn6Q58IdRdw== X-Received: by 2002:a63:1562:: with SMTP id 34mr9871680pgv.71.1615784550783; Sun, 14 Mar 2021 22:02:30 -0700 (PDT) Received: from sjg1.roam.corp.google.com (85.72.69.111.dynamic.snap.net.nz. [111.69.72.85]) by smtp.gmail.com with ESMTPSA id n10sm1921467pjo.15.2021.03.14.22.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 22:02:30 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Bin Meng <bmeng.cn@gmail.com>, Simon Glass <sjg@chromium.org>, Marek Vasut <marex@denx.de>, Pavel Herrmann <morpheus.ibis@gmail.com> Subject: [PATCH 29/34] dm: core: Add CBFS support to flashmap Date: Mon, 15 Mar 2021 18:00:29 +1300 Message-Id: <20210315173656.29.I33da43566886210a8221a585ddc7ff5d3d395a19@changeid> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210315050034.1934660-1-sjg@chromium.org> References: <20210315050034.1934660-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
x86: Enhancements for booting from coreboot
|
expand
|
Allow referencing a CBFS file in the flashmap, so that it is possible to
boot from coreboot, where files are not available from binman.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
include/dm/of_extra.h | 8 ++++++++
1 file changed, 8 insertions(+)
Applied to u-boot-dm/next, thanks!
diff --git a/include/dm/of_extra.h b/include/dm/of_extra.h index ca15df21b06..fc4f9743196 100644 --- a/include/dm/of_extra.h +++ b/include/dm/of_extra.h @@ -11,7 +11,11 @@ enum fmap_compress_t { FMAP_COMPRESS_NONE, + FMAP_COMPRESS_LZMA, FMAP_COMPRESS_LZ4, + + FMAP_COMPRESS_COUNT, + FMAP_COMPRESS_UNKNOWN, }; enum fmap_hash_t { @@ -30,6 +34,10 @@ struct fmap_entry { enum fmap_hash_t hash_algo; /* Hash algorithm */ const uint8_t *hash; /* Hash value */ int hash_size; /* Hash size */ + /* Node pointer if CBFS, else NULL */ + const struct cbfs_cachenode *cbfs_node; + /* Hash node pointer if CBFS, else NULL */ + const struct cbfs_cachenode *cbfs_hash_node; }; /**
Allow referencing a CBFS file in the flashmap, so that it is possible to boot from coreboot, where files are not available from binman. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/dm/of_extra.h | 8 ++++++++ 1 file changed, 8 insertions(+)