From patchwork Mon Oct 2 17:49:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 147476 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1700276vqb; Mon, 2 Oct 2023 14:27:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEV1yMFgbTXETP9UPjS8JmkXJL3gsSBV50/aKup6k7f398C+/F/wUeAeUuP9op+OdujsI0Z X-Received: by 2002:a05:6871:821:b0:1bb:724f:2bca with SMTP id q33-20020a056871082100b001bb724f2bcamr15708762oap.1.1696282030003; Mon, 02 Oct 2023 14:27:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696282029; cv=none; d=google.com; s=arc-20160816; b=KIKAeo7L/fJiq3HW0bGaqAwBSiyEEGdXbBqNNOJO+GG7MZmLm77FJB+6JL8TjPq7Dw Fq34I7+zH6xla4b/RWxBnincbfxJTzjOV1ohrcHEEw3xnHZDg87UwyS+DkIsFI8uN+kl GXa3dsReH18nRsDCImMdXpSa8qaC6xZKMSlzc3sriFyT2TX1sdoyzRqvrzKY1GJ8Aq8H l7kzYW/KdWGMoCHgEggF/QfEHEg8ijJ1v3illIUnRds5BRwV71EPoEkNyf3EyscuJdkB KDHBENFHLbOo0j0uuGPpk4J/XM4s0j20uTqPMFSXyBWxIO8IMaC5NBX6aopnIzmqSjPQ iZMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=k71/w5tQzn4vicDbb9dqcU9SEKAhIvW7cb6nA8shinc=; fh=jYwhyVXmB0eqS9GbEs3tY4F+w0u06QNPdBUdcHr1WSI=; b=EmcwRcMHPQ1rd4l2mYoqQVeOzyATm5MqSZWHRstJSGSmNBsWI6iB3t4/sld1qWkeaa AS7zvho0IZZa8BxQSgOsVJx5Ig2rB7yRQ0kRxvuy5mVo3q3aNRMKPLKj4VIzcfon5b1R Qskt9vlxEroQh9P2Dr0TnUgZD1dA8VEZQrH9QUyMSVJ9c61wNUBZ51QhqEg+jsoRX/51 4m3IGMrEt49c+uuyXMaTFKyR8jS4yb/Wpq7lntldlIQdslviR8XGFB5nB7/yMVUJbq3d ZsWK5zceBjema6SaxJrZ7V+WMPdYXt7YJDJvlLandEyVRqAyYC8zNppDdfEs98eF3iKt K0gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=k4eei0ut; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id h132-20020a636c8a000000b00564bcae8b53si27967370pgc.803.2023.10.02.14.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 14:27:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=k4eei0ut; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 66B968049D58; Mon, 2 Oct 2023 10:50:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237464AbjJBRu2 (ORCPT + 18 others); Mon, 2 Oct 2023 13:50:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229563AbjJBRu0 (ORCPT ); Mon, 2 Oct 2023 13:50:26 -0400 Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4927183 for ; Mon, 2 Oct 2023 10:50:23 -0700 (PDT) Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-79fa5d9f3a2so239f.3 for ; Mon, 02 Oct 2023 10:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696269022; x=1696873822; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=k71/w5tQzn4vicDbb9dqcU9SEKAhIvW7cb6nA8shinc=; b=k4eei0utiOJesXtZQ51L6fvgK/efzcOJp/15EYG7K+IaxOupBksjh7jvnDoHMvkPse rcWshuer51ZaVdj8Bo3ofJ0xPh92PYeKdchi1x0HmTQsy8FI04ddhVLBBrvZhCCMx+Xe u4Y/blSP7xA1x2oziAAFakli/jXAiNIZrDDJg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269022; x=1696873822; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=k71/w5tQzn4vicDbb9dqcU9SEKAhIvW7cb6nA8shinc=; b=sn3CPksvIu0rc2ljEp7wz2ZKjvNdr9m6cfGArOamaN7z63hCsw0lHjUfKYq04GC5yu 7y2QbYOFCKiZ96bD29UpDjnlUwg0AuTuMr0GC+hqodtX5/6VFwMDXgt9NJmllCvxp5S9 iOBzpF7UCVdusaWsKAtIbh8CCUHI4W5C1+2UfQBtghJ0rU9vllc5/vr4GxMrFWEdGDZM Mng3MSFuA60UshCmwNRHvqAAEenytR+xXlnjz2eqJa/xR4op8umjEIB1ryGf2ErpNBd4 ctEybsg3s3TJtcPlcGM1pfgM66JvLeCM27kUwoBIiTY2ZZ0hMxRoP8U5yYg7ej8ZA+aJ qZ8Q== X-Gm-Message-State: AOJu0Ywv3+Hb4+tVB1OcqGbx9Ufn7JrCD8RWWgE73tYeLmbZEsA4EycE HKVzLMCTD5tke9EMgrYN8Ch/vA== X-Received: by 2002:a5d:9cd5:0:b0:794:cdd8:db3c with SMTP id w21-20020a5d9cd5000000b00794cdd8db3cmr14699347iow.17.1696269022549; Mon, 02 Oct 2023 10:50:22 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:63cd:2673:520:2e9]) by smtp.gmail.com with ESMTPSA id s23-20020a02c517000000b0042b2e309f97sm6919562jam.177.2023.10.02.10.50.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:50:22 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: Rob Herring , Tom Rini , U-Boot Mailing List , linux-mtd@lists.infradead.org, Simon Glass , Conor Dooley , Krzysztof Kozlowski , Miquel Raynal , Pratyush Yadav , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] dt-bindings: mtd: fixed-partitions: Add binman compatible Date: Mon, 2 Oct 2023 11:49:40 -0600 Message-ID: <20231002174948.1015223-1-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.582.g8ccd20d70d-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 10:50:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778680625559526159 X-GMAIL-MSGID: 1778680625559526159 Add a compatible string for binman, so we can extend fixed-partitions in various ways. Signed-off-by: Simon Glass --- Changes in v2: - Drop mention of 'enhanced features' in fixed-partitions.yaml - Mention Binman input and output properties - Use plain partition@xxx for the node name .../bindings/mtd/partitions/binman.yaml | 61 +++++++++++++++++++ .../mtd/partitions/fixed-partitions.yaml | 3 + .../bindings/mtd/partitions/partitions.yaml | 1 + MAINTAINERS | 5 ++ 4 files changed, 70 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml new file mode 100644 index 000000000000..844f241feebf --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman firmware layout + +maintainers: + - Simon Glass + +select: false + +description: | + The binman node provides a layout for firmware, used when packaging firmware + from multiple projects. It is based on fixed-partitions, with some + extensions. + + Binman supports properties used as inputs to the firmware-packaging process, + such as those which control alignment of partitions. This binding addresses + these 'input' properties. For example, it is common for the 'reg' property + (an 'output' property) to be set by Binman, based on the alignment requested + in the input. + + Once processing is complete, input properties have mostly served their + purpose, at least until the firmware is repacked later, e.g. due to a + firmware update. The base 'fixed-partitions' binding should provide enough + information to read the firmware at runtime, including decompression if + needed. + + Documentation for Binman is available at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html + + with the current image-description format at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html#image-description-format + +allOf: + - $ref: /schemas/mtd/partitions/fixed-partitions.yaml# + +properties: + compatible: + const: binman + +additionalProperties: false + +examples: + - | + partitions { + compatible = "binman", "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + label = "u-boot"; + reg = <0x100000 0xf00000>; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml index 331e564f29dc..85aef1572967 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml @@ -24,6 +24,9 @@ properties: - items: - const: sercomm,sc-partitions - const: fixed-partitions + - items: + - const: binman + - const: fixed-partitions "#address-cells": true diff --git a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml index 1dda2c80747b..849fd15d085c 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml @@ -15,6 +15,7 @@ maintainers: oneOf: - $ref: arm,arm-firmware-suite.yaml + - $ref: binman.yaml - $ref: brcm,bcm4908-partitions.yaml - $ref: brcm,bcm947xx-cfe-partitions.yaml - $ref: fixed-partitions.yaml diff --git a/MAINTAINERS b/MAINTAINERS index 5f18c6ba3c3c..367c843ec348 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3517,6 +3517,11 @@ F: Documentation/filesystems/bfs.rst F: fs/bfs/ F: include/uapi/linux/bfs_fs.h +BINMAN +M: Simon Glass +S: Supported +F: Documentation/devicetree/bindings/mtd/partitions/binman* + BITMAP API M: Yury Norov R: Andy Shevchenko From patchwork Mon Oct 2 17:49:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 147503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1714009vqb; Mon, 2 Oct 2023 15:01:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHoJ+1VhSje4akylmA4nTkhwiATR3XO31euc+bGLcNcgq0VlZH44V2cbD2WmaKMTNHpa4ii X-Received: by 2002:a05:6a00:2442:b0:690:449f:5e96 with SMTP id d2-20020a056a00244200b00690449f5e96mr11196352pfj.33.1696284079650; Mon, 02 Oct 2023 15:01:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284079; cv=none; d=google.com; s=arc-20160816; b=w+eVBdy/QMjWcCJ6tugCZIY09vR0HNVAu3ZPe2L25joIlSN6RRniasbk3WlB85g4iZ p7GAH+v0npEBj5khuEeuiQ0SsV+aM0zPfXciyFiNHMGsVTSwI3XIpWsur4MdigwGuxYm DDLV/pEymNgDNziyw3TpSiQo+YpYVOnED9C2AQZqmowaIM6Y0nZlSIYsd0QA6XWPHjkf cOyQyDKlA/M/SA6oqGes3mL70hF2jIbzQjD57fWWZth+I871/+0OMNLzjQtWxJ9SzxRT qrafPPdX+sCKGnDoi809yw9kwbwCo8Fahpsx8cpJhJgHhAZQEABlTXUd6vKdctT6eLae pckQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=F2OIh/G3vvfH8cT1f+jhivcT+xHStCXj54HHC5DhSlw=; fh=Qv8OsorF1ClzIIlobsfS2QPEBCIkSYqmDz6uYikQsNA=; b=02wsd9mwBWtfq9xmbYs/+bc+zp1JZPywMTx9cn3lNWsG8IqoukLwVPx3t3moELZ1I0 +GRL9x3pD80Id8otw0j/5mzEHVzAgHhqWB+COiagPupy7CRjgo6H7LtyL9isH/RlAtND oMryYJLy05KVcQmHXA3SAiJoY2ALhVKQFXa4XsVNctMmByxUdXXsb7GmRHf/SZdpnldt p0XO19FXuYrcX2OnnFJegQZqOy+DbSwusDnuX7CIQGumaSrHbrcTNmodvR+rb5dGP/8B +wFWDJQ6XrYhxQxf6kS2zZzxa2b7jYqr2tZFwIW5SNL4mR1cQdgkGQWWorpCJ8MbrB9s ACnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=AWo5QFqi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id t24-20020aa79398000000b00690228b1d45si25928150pfe.342.2023.10.02.15.01.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:01:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=AWo5QFqi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 6079D8083B67; Mon, 2 Oct 2023 10:50:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237951AbjJBRuk (ORCPT + 18 others); Mon, 2 Oct 2023 13:50:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237853AbjJBRuj (ORCPT ); Mon, 2 Oct 2023 13:50:39 -0400 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83895C6 for ; Mon, 2 Oct 2023 10:50:35 -0700 (PDT) Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-76c64da0e46so810139f.0 for ; Mon, 02 Oct 2023 10:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696269035; x=1696873835; darn=vger.kernel.org; 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=F2OIh/G3vvfH8cT1f+jhivcT+xHStCXj54HHC5DhSlw=; b=AWo5QFqi3vDLNgXtRAXU3v3ejAKlGFEYneI+WL/VuF3O37bI7rgOhwwfIddbR8TBDZ b9+DOJuI0NYMxPztTllcC5SGi5IQg5w7T772e9ZMNOcmwPmjtG2nz9WfFxrIOiHEQuEC Q3ebbxjgqIpHFCeYrZ/RRXtP4Q7yVaF1LV3ZE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269035; x=1696873835; 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=F2OIh/G3vvfH8cT1f+jhivcT+xHStCXj54HHC5DhSlw=; b=RVoGXuM1FmwimujD4oRU4SPhhZ4EPmY//cHP0LRX6g/EbijMBWkUd6/Tp29JXA6XSZ lJG40ddl7FWzDbO4C8UzSrdhA8rD76cidGsV3+t/JyzB8nmqtLBAGhfOuNik27nJJc1K Nz65nXUIycdZFHBQs/rYejQjq/y25bRmIOeHUom88wmJYl19y3l6gRqaMrIydLmGoPPq zoVnrCI3Mya2S+QGpo4vHUwKg8NHmfcAKQEIPNWHKuXIzuUjqYv/ZwNd4WsTOhjaQCR4 mxEMp/nTJeCEctz/R/tjH2h1azm20/MkummvYfXwRLbYgQJGcd3H+KMT3/4OzHi2RVFJ GFdQ== X-Gm-Message-State: AOJu0YxtU9UifcUrXZ5Z41IubBWZBjSTz0SpJBSjgaRBBIBzxF/TrCCC uYPP5Y8TIn3SNXgWJfedPAHeHg== X-Received: by 2002:a5d:9cd5:0:b0:799:36c2:fa49 with SMTP id w21-20020a5d9cd5000000b0079936c2fa49mr12850092iow.15.1696269034885; Mon, 02 Oct 2023 10:50:34 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:63cd:2673:520:2e9]) by smtp.gmail.com with ESMTPSA id s23-20020a02c517000000b0042b2e309f97sm6919562jam.177.2023.10.02.10.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:50:34 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: Rob Herring , Tom Rini , U-Boot Mailing List , linux-mtd@lists.infradead.org, Simon Glass , Conor Dooley , Krzysztof Kozlowski , Miquel Raynal , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] dt-bindings: mtd: binman-partition: Add binman labels Date: Mon, 2 Oct 2023 11:49:41 -0600 Message-ID: <20231002174948.1015223-2-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.582.g8ccd20d70d-goog In-Reply-To: <20231002174948.1015223-1-sjg@chromium.org> References: <20231002174948.1015223-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 10:50:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778682775091296633 X-GMAIL-MSGID: 1778682775091296633 Add two labels for binman entries, as a starting point for the schema. Signed-off-by: Simon Glass --- Changes in v2: - Use plain partition@xxx for the node name .../mtd/partitions/binman-partition.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml new file mode 100644 index 000000000000..406a8997d3e4 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman-partition.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman partition + +maintainers: + - Simon Glass + +select: false + +description: | + This corresponds to a binman 'entry'. It is a single partition which holds + data of a defined type. + +allOf: + - $ref: /schemas/mtd/partitions/partition.yaml# + +properties: + label: + items: + enum: + - u-boot # u-boot.bin from U-Boot projec6t + - atf-bl31 # bl31.bin or bl31.elf from TF-A project + +additionalProperties: false + +examples: + - | + partitions { + compatible = "binman", "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + label = "u-boot"; + reg = <0x100000 0xf00000>; + }; + + partition@200000 { + label = "atf-bl31"; + reg = <0x200000 0x100000>; + }; + }; From patchwork Mon Oct 2 17:49:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 147493 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1712486vqb; Mon, 2 Oct 2023 14:58:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFsOK2a+6T4nIi01+4bDsMKWzQp6WFVsXuT1By0S78epjgdvouSdeWhN7l92uR6UFBqjd0W X-Received: by 2002:a17:90a:c913:b0:274:8a03:b546 with SMTP id v19-20020a17090ac91300b002748a03b546mr12192593pjt.23.1696283913762; Mon, 02 Oct 2023 14:58:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696283913; cv=none; d=google.com; s=arc-20160816; b=TsaaAXMB7Z+9W3j3UdAJ3XpMs+B0tx0A7G0HTU+Nf60G8x+vuL0HTn4q5pU4+Tegva Rd94A3QmijPtUKLX+AJYQ6gVhsmFZbsp9NEJD899U4jDv8ErAWp417o+aQH2VHklBylO bDBBIBhV+7BLyW3lCyuVMhoCSfbRS+oyIKDhGRJezuKENPkPV98UlsGEapXwSzwYfTa6 lNhrRwzzgsDVnOgQxEroWj5M4XKBeK0QTTNhQsr5vXNxYMZqujxmJwhgShN19qeqwX5T CrFzktOFgBqJcuSFkR8OJPsEyO5ivmNY2Y4+yd1e3YMC1AwdQ2TlTD73nPeGgZLWv6// 9U4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5LS+wV2LMgqbRwabaSq2Ufumv4REcBt1Upfkm2T5IrI=; fh=Qv8OsorF1ClzIIlobsfS2QPEBCIkSYqmDz6uYikQsNA=; b=N2NRWqSLIsYVmNFUDg1h4E0GY6Wo1af3XRkKUo39K0t9/6/iWm5e6pHWOOJCortQUQ CT+JHHe0XoyoGYlSdyGFTChsXE/YxcylU3BVpnmGPC3jwzzdPeEM7c5np+XpDf39tKGU OT7LBOx2G6iQHCqf1L0cCPPP8aT4mYN/Ppz9wlGeTmK2ETYa2tLaD5AS47groUHCL9Ql VQP8TNOkSiPVt+I5kXCGhjPCANO/1leAOz1+dsFTcQ4JRyzNaXnxHZo8uqwv8+YmudZd +RcWwDEAwZ/LdEvaAz7QFp0PEqjwdry4IajOpsOrnGaiRUJsaHskSHAaDBFTPzZsvIaT +LQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=DqkqQNHY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id gv17-20020a17090b11d100b0027762924984si7878996pjb.183.2023.10.02.14.58.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 14:58:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=DqkqQNHY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id C12EB8065CE7; Mon, 2 Oct 2023 10:50:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237959AbjJBRun (ORCPT + 18 others); Mon, 2 Oct 2023 13:50:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237373AbjJBRuj (ORCPT ); Mon, 2 Oct 2023 13:50:39 -0400 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F10D9E for ; Mon, 2 Oct 2023 10:50:36 -0700 (PDT) Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-3528bc102adso4345ab.2 for ; Mon, 02 Oct 2023 10:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696269036; x=1696873836; darn=vger.kernel.org; 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=5LS+wV2LMgqbRwabaSq2Ufumv4REcBt1Upfkm2T5IrI=; b=DqkqQNHY+IYCf5HSOOaD7V6EJeYSbQtKl8QekIsJSKyuaQ/EGirQQTeIpNTXmBPoRT e6PRPFMHvDW2FIBrWxZvb8ZRI5ahd95e1sTG4Mh0XRyhOueMSHzFfjGUXfyjtktVFVYP xmzNSCnoP5/SnYP7+F9iSP1BQpclhObVYNqYk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269036; x=1696873836; 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=5LS+wV2LMgqbRwabaSq2Ufumv4REcBt1Upfkm2T5IrI=; b=dq+cXkeNPEzkcdVu1w+IYPCoNH+30VQLqa/5AHRm1hd/qyAxPP2O8vsfKJI2oyaMYS l9xPbbHWH1ebASEydMdqng4GeQZC1Y9ALr2wOA2ZHXucvc8Hd/PuOUy2KHwBH/P+vyHC sM2O1SKjltkdo5anCH+lE/Wjqr+Ve2F6P9xK8K1eqSYg0u005YCZUqB6WHjwsGp+dwde yA/sbkLQ2CrRWOGYK0XAe7H0GYWXaENAEpCHKCmPbtVr7nvH1bkxSE9PhmvfV0KRf4oR Oi1TvLytCsoulBoDpiprVHVYAkKmSUk/WKhyCA6kCPNTud4uyOan6b2r+YyXbuKCPyPW sq1g== X-Gm-Message-State: AOJu0Yz9t6InqBFmquPxU2qOt06I6j1emLe5mA+0h/M1lVUXZ8dBO/e9 nBNb5fn52NEAdoyUwSzfG9AAMQ== X-Received: by 2002:a05:6e02:1d16:b0:349:3756:b1ce with SMTP id i22-20020a056e021d1600b003493756b1cemr14675384ila.2.1696269035979; Mon, 02 Oct 2023 10:50:35 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:63cd:2673:520:2e9]) by smtp.gmail.com with ESMTPSA id s23-20020a02c517000000b0042b2e309f97sm6919562jam.177.2023.10.02.10.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:50:35 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: Rob Herring , Tom Rini , U-Boot Mailing List , linux-mtd@lists.infradead.org, Simon Glass , Conor Dooley , Krzysztof Kozlowski , Miquel Raynal , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] dt-bindings: mtd: binman-partitions: Add alignment properties Date: Mon, 2 Oct 2023 11:49:42 -0600 Message-ID: <20231002174948.1015223-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.582.g8ccd20d70d-goog In-Reply-To: <20231002174948.1015223-1-sjg@chromium.org> References: <20231002174948.1015223-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 10:50:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778682601169711024 X-GMAIL-MSGID: 1778682601169711024 Add three properties for controlling alignment of partitions, aka 'entries' in binman. For now there is no explicit mention of hierarchy, so a 'section' is just the 'fixed-partitions' node. These new properties are inputs to the packaging process, but are also needed if the firmware is repacked, to ensure that alignment constraints are not violated. Therefore they are provided as part of the schema. Signed-off-by: Simon Glass --- Changes in v2: - Fix 'a' typo in commit message .../mtd/partitions/binman-partition.yaml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml index 406a8997d3e4..be7273a4c9ac 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml @@ -27,6 +27,42 @@ properties: - u-boot # u-boot.bin from U-Boot projec6t - atf-bl31 # bl31.bin or bl31.elf from TF-A project + align: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This sets the alignment of the entry. The entry offset is adjusted + so that the entry starts on an aligned boundary within the containing + section or image. For example ‘align = <16>’ means that the entry will + start on a 16-byte boundary. This may mean that padding is added before + the entry. The padding is part of the containing section but is not + included in the entry, meaning that an empty space may be created before + the entry starts. Alignment should be a power of 2. If ‘align’ is not + provided, no alignment is performed. + + align-size: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This sets the alignment of the entry size. For example, to ensure + that the size of an entry is a multiple of 64 bytes, set this to 64. + While this does not affect the contents of the entry within binman + itself (the padding is performed only when its parent section is + assembled), the end result is that the entry ends with the padding + bytes, so may grow. If ‘align-size’ is not provided, no alignment is + performed. + + align-end: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This sets the alignment of the end of an entry with respect to the + containing section. Some entries require that they end on an alignment + boundary, regardless of where they start. This does not move the start + of the entry, so the contents of the entry will still start at the + beginning. But there may be padding at the end. While this does not + affect the contents of the entry within binman itself (the padding is + performed only when its parent section is assembled), the end result is + that the entry ends with the padding bytes, so may grow. If ‘align-end’ + is not provided, no alignment is performed. + additionalProperties: false examples: @@ -39,10 +75,13 @@ examples: partition@100000 { label = "u-boot"; reg = <0x100000 0xf00000>; + align-size = <0x1000>; + align-end = <0x10000>; }; partition@200000 { label = "atf-bl31"; reg = <0x200000 0x100000>; + align = <0x4000>; }; };