From patchwork Mon Oct 21 03:38:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1180236 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="POmqwkU0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46xNLb6P3Mz9sPL for ; Mon, 21 Oct 2019 15:04:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7CD04C21DD4; Mon, 21 Oct 2019 03:50:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BD3A8C21D8A; Mon, 21 Oct 2019 03:50:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ACE2EC21D8A; Mon, 21 Oct 2019 03:40:37 +0000 (UTC) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id 0CE8DC21D83 for ; Mon, 21 Oct 2019 03:40:37 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id i12so173174ils.6 for ; Sun, 20 Oct 2019 20:40:36 -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=65FHb8DbNyz4EflBWAh5n5DrG3jy6jXp/zGRWMNR6c4=; b=POmqwkU0BJo/nTMu3R+7DP+y0oQtuVDy2ZD1TRjKXuwdU6pIQZNg76LCFgBC+Q9PH5 qc6BLhOSftVKWkYWFWxT2CKDo8Md14UervghDCfwu02djiTV4+JKVXS6353rjL3pB3k+ 9EzUAI6CTpCJSDkn1JvOhCjIshNn1pB7P21zQ= 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=65FHb8DbNyz4EflBWAh5n5DrG3jy6jXp/zGRWMNR6c4=; b=NaNSDYyL6CdsbV/z6aQgndatouBu/FMNADUqpKo3tM2fiWLgsmhLIkFNe1SMH9+Imt 2+eEGDPPgi/OeNqq+qeIVsSy9hCWzB4vAMDNYg3CgdPDTuLozTAVW5Z765102R/9FZUF +mK96zDjvV2IJtyGFEYZUbbZPscdfSPnlx0ANDQgQrjwNbEHtnSw0L5bXUjYiJZu/NXe kI034sW6rDa5QrWid3BSZiTqWoIsWGVQ9UhupirmtDyvJCYB5n2wjMMmsnxuz58EpV6c en1PsCFl6uonDR+QursaJUWHPosRREQSYhHCTKqh8mFAnfyY7Vgla5dxLQz2u3ZoDbbN JN3A== X-Gm-Message-State: APjAAAXePFYGpXDnNZez+PVSmz+gYi7q+pOhgkrlD5pNi5rOaqJO4O7R vtK86idMuNLeutOIIyNN1o7P6rmwhncDBA== X-Google-Smtp-Source: APXvYqx2z1zlFzfi/9NEGlDbsMvBlgzgO8Fqlb0IaMExz+5J26cd4ncOciFTrxa4UL+QTcvBDFDWbA== X-Received: by 2002:a92:c94f:: with SMTP id i15mr24673803ilq.293.1571629235826; Sun, 20 Oct 2019 20:40:35 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id x14sm1947028ion.67.2019.10.20.20.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2019 20:40:34 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 20 Oct 2019 21:38:37 -0600 Message-Id: <20191021033913.220758-67-sjg@chromium.org> X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog In-Reply-To: <20191021033913.220758-22-sjg@chromium.org> References: <20191021033913.220758-22-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 072/108] x86: Separate out U-Boot and device tree in ROM image X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" At present binman does not support updating a device tree that is part of U-Boot (i.e u-boot.bin). Separate the entries into two so that we can get updated entry information. This makes binman_entry_find() work correctly. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v3: None Changes in v2: None arch/x86/dts/u-boot.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index bb61b6e8af1..0f3690e8188 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -49,9 +49,11 @@ }; u-boot-spl-dtb { }; - u-boot { + u-boot-nodtb { offset = ; }; + u-boot-dtb { + }; #elif defined(CONFIG_SPL) u-boot-spl-with-ucode-ptr { offset = ;