From patchwork Sat Dec 7 04:42:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1205394 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=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=) 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="oVi0H7pZ"; 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 47VHJ33Txjz9sPL for ; Sat, 7 Dec 2019 15:57:23 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 45B848176F; Sat, 7 Dec 2019 05:50:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (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=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="oVi0H7pZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F32F281776; Sat, 7 Dec 2019 05:49:59 +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=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) (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 E3C688174A for ; Sat, 7 Dec 2019 05:49:56 +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-io1-xd44.google.com with SMTP id s2so9472699iog.10 for ; Fri, 06 Dec 2019 20:49:56 -0800 (PST) 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=344DYYLG/knvh8EVkCeOufVyh4+kj9xM5J6ifsB2nlU=; b=oVi0H7pZv1k9uJ6oJgwIIeLH/kIm/bfe8OKqDnwHorHHFZibmxJMWeK67zFeyHW44t G669G4c2SES0ZDEZRZZcG8ljFlejTiY2t4IJvj2pJUOAErlbRsCOqEvrYGH7wHllrcO/ k4u6kdaGw9mAtryT4902zP8Pt+CrlPiYYLkxM= 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=344DYYLG/knvh8EVkCeOufVyh4+kj9xM5J6ifsB2nlU=; b=cCE2bm3w/0J+VBzx3FrOaBhs/JTNSX7Uhls8nb10TNhNM1jqYk2PBaozooy4i7Nmzp S69j0fm0/D6Kb3jssQ9mlO6B20PqB30hrqf1ciFyiaRFzaOmYwNxj6Q9gDlK1Tqz6+QK MeRw01I3MDJk4BIf2LlGydztUF82faRQLo/2ua8Iz7D2Zs/WJoGpoYc02Ma7ujTDzZoF sabM/V+R7SvD/wulmUEfEZw/Brt2ToYZxrsVTEKZeoAOSDfHRzZxvQBshlaqrJKW9tzc 5unVcntr5y+xADjoDhyxclwDjFWxjznB0lchGW/m2HQvgUs2rrL3bz6cRmsOi3R2fWpA GZLQ== X-Gm-Message-State: APjAAAWd/xVaAmBeFcDFDIHvqEUirxXHmhof5qhCP1bS7Af6NwjaHnW+ U+Z79J8nu5rKcABJ12Rq40icZzT9jNw= X-Google-Smtp-Source: APXvYqzvIbeTXo5NeKdUemC67wNwK1a0hx48UBjUDp60HlBE3uquHxBYVpyhQi28lyt15rb012nzbg== X-Received: by 2002:a5e:c20b:: with SMTP id v11mr12958396iop.56.1575694195762; Fri, 06 Dec 2019 20:49:55 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id o7sm4549410ilo.58.2019.12.06.20.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 20:49:55 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Subject: [PATCH v6 060/102] x86: Separate out U-Boot and device tree in ROM image Date: Fri, 6 Dec 2019 21:42:33 -0700 Message-Id: <20191206213936.v6.60.I2f1b39100523d60d688c251b38ced615624a4ed3@changeid> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191207044315.51770-1-sjg@chromium.org> References: <20191207044315.51770-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 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.101.4 at phobos.denx.de X-Virus-Status: Clean 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. Do the same for SPL tool. In both cases, group the two parts into a section so that SPL symbols get the correct total size. It may be possible for binman to handle this automatically at some point, by ignoring u-boot.bin and always creating it from u-boot-nodtb.bin and u-boot.dtb Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v6: None Changes in v5: - Change SPL as well - Group U-Boot and device tree into a section - Rename spl section to 'spl' so that binman symbols can find it Changes in v4: None Changes in v3: None Changes in v2: None arch/x86/dts/u-boot.dtsi | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index e0cca58640..f0f8c71761 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -44,13 +44,21 @@ u-boot-tpl-dtb { }; #endif - u-boot-spl { + spl { + type = "section"; offset = ; - }; - u-boot-spl-dtb { + u-boot-spl { + }; + u-boot-spl-dtb { + }; }; u-boot { + type = "section"; offset = ; + u-boot-nodtb { + }; + u-boot-dtb { + }; }; #elif defined(CONFIG_SPL) u-boot-spl-with-ucode-ptr {