From patchwork Mon Oct 9 22:04:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 150371 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2143294vqo; Mon, 9 Oct 2023 15:04:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE20MECHiyJO4XqWUA1yAq0jJda4BNf55hr7fCdSF2vwtHmwUB4YSL0u244s5Q+ifk1BtmI X-Received: by 2002:a17:902:e5c7:b0:1c6:ec8:4c67 with SMTP id u7-20020a170902e5c700b001c60ec84c67mr16077116plf.18.1696889093301; Mon, 09 Oct 2023 15:04:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696889093; cv=none; d=google.com; s=arc-20160816; b=0jgr9VlWTSYh+gOQftXpSTBhPFIUXX8hG4tDfbf0+wP7DLYOEFmzASTedC9G342VmZ 3x7ue7kr+AreXNiCOdNJLmbuTlnXXM+qrNmOUWzxV6gWu2ea1XTmtF5yvnkyCdx0h93e 55BIIFrONyfQPVfrLVhCV9rx0lFRWlUJOanTC+SyRjbxXX42h85F+PEISjM2fExk7qx/ oXDYk+UTZZnEwwWXyZUii/CaXPedxGd6ul99d8KYoaU1SgeFxBJRnrsk0vPovhmblHMW re9Nog8Cu3hfBB9VuduorPiHv4QYC/LQZ//+NltQFqnkesuqRueN7neXHLBljxhZssBT nHzQ== 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=Y9yY9Pt5Z+lcy2ZFBIazS1/xG4eT3Pf+M3kQNkzl3b8=; fh=BBKD6vE5fr2jrHS00vZfU/AHxbwXs5aThMCYZbHzh18=; b=yql/Ja6irtlU8ZcS6UWUMk6zEiShVoERAx5ojNTxxLzcddt/zn4XCflieWq+79+XFh KqJwU4GChNHFsxT+Tp3rNIZ57hYDXu9NVhggRldjRG5f1UjrKY9aMGCs5CMECDCLtA0n XAXMymlDPORgfeA7oQnzDcM55Vhjs7xRiAczMBN81WAQgGdSq9C7wI+jAVtlWuF7QvSC ympVyznugSXOdMhcPkfzO5CX7/QJSfcyxTXBUPPZdO+ELPvFP/hqyaxRSfHkSVvq0+LZ MesnhFgt0KU3iIC+MkUXOZHmoxCbml8YKZF33mhwmlBM93j5Ea2CpV60lWaLlJw70PPd nm5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="eicau85/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b14-20020a170902d50e00b001bdc664cd69si192388plg.153.2023.10.09.15.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:04:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="eicau85/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 6CC0080E73F4; Mon, 9 Oct 2023 15:04:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378726AbjJIWEr (ORCPT + 19 others); Mon, 9 Oct 2023 18:04:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378742AbjJIWEp (ORCPT ); Mon, 9 Oct 2023 18:04:45 -0400 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B377E6 for ; Mon, 9 Oct 2023 15:04:40 -0700 (PDT) Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-35135f69de2so16897485ab.2 for ; Mon, 09 Oct 2023 15:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696889080; x=1697493880; 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=Y9yY9Pt5Z+lcy2ZFBIazS1/xG4eT3Pf+M3kQNkzl3b8=; b=eicau85/ADe5/MNhNknc28k7+RJBMV/zN0PHGnmrJs5R1fSllzzxnDsqFRAQLjXMam RD0zkPQqEWTpLzcxh81AKddbJ33+mPn3BC+1foTqBERf1QO2VKRAEAP5cZpGT21+b8K0 q/6v7poi9W5Zavi3cU6BITyeIaV2CVNRrDU+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696889080; x=1697493880; 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=Y9yY9Pt5Z+lcy2ZFBIazS1/xG4eT3Pf+M3kQNkzl3b8=; b=RBqOBM2lo3V+JSHhlqFOGQNniiYACR9FfsHPrfBZ0Xema4Sa8W0V1thftbJXWmnrkB PqeESujDzWS6KR+MR3cENG5xqRBsXtfXGtnhV8A8RKHhRlIaRgLfDuOFl6/bhfgtYmYJ i0DoWirepx6PhXFiiimskP++Kh3BTYdkKQduqrofiWcoj41qvBJO1NqgvD06T35ekF3r SrM4SI3gduT8o/s2gupGNHfXY1nD7/ZBQdI43TMzP0iE7C5MdpAKeRJBxUY0PUshImmI sHVtgzCCe23iY4qwA6My5xykNNFWgNUyl+mK0ukarD5xGOZHaYl7w1j1aL3UkJnAhANq 70dg== X-Gm-Message-State: AOJu0YwOrkUrXjWQJvmpKJ5K/A6VFD3Lr45bjG3MYpq2c3J5xKB+gMYd rPSM1sZRlYGOAgJbDW7osd9Xvw== X-Received: by 2002:a05:6e02:1a2e:b0:351:4f0c:b95d with SMTP id g14-20020a056e021a2e00b003514f0cb95dmr20621874ile.22.1696889079842; Mon, 09 Oct 2023 15:04:39 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:138c:cf57:c18d:20f5]) by smtp.gmail.com with ESMTPSA id o3-20020a92d4c3000000b0034cd2c0afe8sm3164063ilm.56.2023.10.09.15.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:04:39 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: linux-mtd@lists.infradead.org, Miquel Raynal , Michael Walle , Rob Herring , U-Boot Mailing List , Tom Rini , Simon Glass , Conor Dooley , Dhruva Gole , Krzysztof Kozlowski , =?utf-8?b?UmFmYcWC?= =?utf-8?b?IE1pxYJlY2tp?= , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v4 1/3] dt-bindings: mtd: partitions: Add binman compatible Date: Mon, 9 Oct 2023 16:04:13 -0600 Message-ID: <20231009220436.2164245-1-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.609.gbb76f46606-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_NONE, 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 (snail.vger.email [0.0.0.0]); Mon, 09 Oct 2023 15:04:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779317177918582851 X-GMAIL-MSGID: 1779317177918582851 Add a compatible string for binman, so we can extend fixed-partitions in various ways. Signed-off-by: Simon Glass --- Changes in v4: - Change subject line Changes in v3: - Drop fixed-partition additional compatible string - Drop fixed-partitions from the example - Mention use of compatible instead of label 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 | 63 +++++++++++++++++++ .../bindings/mtd/partitions/partitions.yaml | 1 + MAINTAINERS | 5 ++ 3 files changed, 69 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..7d6c8bd738f5 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml @@ -0,0 +1,63 @@ +# 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, but uses 'compatible' to indicate the contents of the node, to + avoid perturbing or confusing existing installations which use 'label' for a + particular purpose. + + 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 '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"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + label = "u-boot"; + reg = <0x100000 0xf00000>; + }; + }; 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 c934244acc31..ebc8158fe67d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3536,6 +3536,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 9 22:04:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 150372 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2143336vqo; Mon, 9 Oct 2023 15:04:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKhsGZVTFCr7ZrnLB1AdKNHadowqdFG+jR9S3fdiy45EAQ4C0oFrugyck4RQrMOaE4Irn+ X-Received: by 2002:a05:6358:988d:b0:143:97c6:1e3a with SMTP id q13-20020a056358988d00b0014397c61e3amr18179029rwa.9.1696889098711; Mon, 09 Oct 2023 15:04:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696889098; cv=none; d=google.com; s=arc-20160816; b=Bw5tt075eFOkBVN69z8kFXfEnOhy7XE2rrnCg/gHSHlVheSWOmyi4zO9IiPEI7kHA4 186jUNysCfZreZys3umpskGHzDHpPOMrBI76XidZ5APUxBJwKG2tqspYqYrEuDguwekh RjcmxMm7EBS9u74bUWyZwDkCr7XNDhuuT3rwpcmIXW/4ozZlIl4qCyv/AHhQtzRFvA6T HZ3/bVdGir+GHzrZ/2159cgv1m/Y76hfMIm1STvPC+4bp/Ttv7nZQounpnRA2OvBaRVk xz4dbsWFUp6QWuOVxEBO26FwpAWkl2liW12bhvW39rtsw8TbvHzf7k1GiIOjFEnrg++X xKMg== 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=8Oy3/oDIsrYxVx08XCzjcM9Z9wsmpIMgRcvueEjHv/4=; fh=IFarww2qplPjrJl7hbkk+Nq7HylZz6B3JgSh2povEMA=; b=1G4gnSShPtg4Cjq4aZ49IHoxAvPMov66EC7nFh3J3lns3FPmYmBM5rsBlNMznYaYVw f41kSiTwL00D2+uv4LCi3HL6PFsB8ctawwdUevfRswPYn3a26HViEQgExU6JfzCFOcsx vRHUSXOaUw8JyGcsVbl4+r2IhRTtVatk3y4zQ7UWJ7qkgLMhahIxtbUkAh4QfwR7xcBg tvCC+jr9bNXIZvmYtzdoVOcfzheu4jC+jLcX1CoFdbz/ifz374jQcllzRiE/ppe1r5S+ h6BDVC6xeG9IODk72RJajKyWxsOMhkkyNMtXTIipNBKXJ77gOWHG9Zl7NxVnrqK+QBQw TkRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ZJfn2IU2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id mm16-20020a17090b359000b0025bb4a1c12esi10203181pjb.148.2023.10.09.15.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:04:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ZJfn2IU2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id ECD6D806500A; Mon, 9 Oct 2023 15:04:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378857AbjJIWEu (ORCPT + 19 others); Mon, 9 Oct 2023 18:04:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378742AbjJIWEr (ORCPT ); Mon, 9 Oct 2023 18:04:47 -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 A3866A9 for ; Mon, 9 Oct 2023 15:04:41 -0700 (PDT) Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-79fe8986355so199308039f.2 for ; Mon, 09 Oct 2023 15:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696889081; x=1697493881; 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=8Oy3/oDIsrYxVx08XCzjcM9Z9wsmpIMgRcvueEjHv/4=; b=ZJfn2IU2szW2+wKn4i2QWfHoCcNMc3YKOnf9totCsBGNOUaK+ZnF7jTC71aMcXkZRr FgDUWey/IU3+CvX6H7XaK1UDSjM8XwimcHzxup7WrbgkTQAfGAxBEz9q+PZWqE+tTM5q jlR6r9fCYm6Xnq/+98MOvAS5aTxWJ/IGVMxb0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696889081; x=1697493881; 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=8Oy3/oDIsrYxVx08XCzjcM9Z9wsmpIMgRcvueEjHv/4=; b=Vcbv77f1jK1wkpjBSgwyQnoLO3aFNB3sKCw5umSmee5BXBLLnYgeQLDsZ7DjKkUhL5 u3vFUOZGhczBRc2yonKB3dZgYFdXlQhbqoB4b/hLmJPXUqIbBVQKrPbUKcq35mZkoMFg I0I3q6Zydc40Y85ftuz9Ll+MStHFTkcGik7oWwOMmDcV9JP6kqKDfiDsmrUoQz+FBJZu pTnkrsQsv5V/K5U6Tie/EijRUBeEtURhzJu6WMhhdYnMyHHCJG0NnmbPmZjCvOFjVVP4 A1f4P5N6hMirt3FIYfwopGIqCb46I3yDmZf0i0ar0Rbd3SodgmMfRbewjmhQxmC5GvY1 h09g== X-Gm-Message-State: AOJu0YwqfZDHIoNTEQz62p9n4rFDT+PhYVa8pHA1icy0KFp9Creh1Z0h g4G9SS2rDIlBG2TTEp4Lys4X3Q== X-Received: by 2002:a05:6e02:170c:b0:350:f510:3990 with SMTP id u12-20020a056e02170c00b00350f5103990mr23056007ill.2.1696889081061; Mon, 09 Oct 2023 15:04:41 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:138c:cf57:c18d:20f5]) by smtp.gmail.com with ESMTPSA id o3-20020a92d4c3000000b0034cd2c0afe8sm3164063ilm.56.2023.10.09.15.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:04:40 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: linux-mtd@lists.infradead.org, Miquel Raynal , Michael Walle , Rob Herring , U-Boot Mailing List , Tom Rini , Simon Glass , Conor Dooley , Krzysztof Kozlowski , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] dt-bindings: mtd: binman-partition: Add binman compatibles Date: Mon, 9 Oct 2023 16:04:14 -0600 Message-ID: <20231009220436.2164245-2-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.609.gbb76f46606-goog In-Reply-To: <20231009220436.2164245-1-sjg@chromium.org> References: <20231009220436.2164245-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_NONE, 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 (snail.vger.email [0.0.0.0]); Mon, 09 Oct 2023 15:04:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779317183599574529 X-GMAIL-MSGID: 1779317183599574529 Add two compatible for binman entries, as a starting point for the schema. Note that, after discussion on v2, we decided to keep the existing meaning of label so as not to require changes to existing userspace software when moving to use binman nodes to specify the firmware layout. Signed-off-by: Simon Glass --- Changes in v4: - Correct selection of multiple compatible strings Changes in v3: - Drop fixed-partitions from the example - Use compatible instead of label Changes in v2: - Use plain partition@xxx for the node name .../mtd/partitions/binman-partition.yaml | 49 +++++++++++++++++++ 1 file changed, 49 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..35a320359ec1 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml @@ -0,0 +1,49 @@ +# 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: + compatible: + oneOf: + - const: binman,entry # generic binman entry + - items: + - const: u-boot # u-boot.bin from U-Boot project + - const: atf-bl31 # bl31.bin or bl31.elf from TF-A project + +additionalProperties: false + +examples: + - | + partitions { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + compatible = "u-boot"; + reg = <0x100000 0xf00000>; + }; + + partition@200000 { + compatible = "atf-bl31"; + reg = <0x200000 0x100000>; + }; + }; From patchwork Mon Oct 9 22:04:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 150373 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2143436vqo; Mon, 9 Oct 2023 15:05:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8z5XgPigk3geZ7nTB6qufgEtPNKmLYTYwW/0Bgyo5Fgcuz24GvCHwhhCu333YTkx1rKEx X-Received: by 2002:a05:6830:1083:b0:6bd:9fa:34ff with SMTP id y3-20020a056830108300b006bd09fa34ffmr16184755oto.9.1696889111543; Mon, 09 Oct 2023 15:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696889111; cv=none; d=google.com; s=arc-20160816; b=yMfhXSAtArWnT39pM/pWp0X1GUKThTlK52WjIVCFmanj5Km4MII5xtMBxZsWxJHQ6l dLGvkTZ4NDcGuwq29mBHPyNVRMC6L7WbIkB49F1LwNA/QPFs7OUrFnGpMpU1txqrt+Kt /KcKNzPQzOoB4Si6ulK/7Jb2YIR9Ieoos/7SZOHBaCflhe+UAy7q9Nnhoc5u91lbzjws Z6KDz/VCLxmX7DmFhYSEgubDAmHxZw9fLvaXeaW5g6IdY2uivC2vwskc4yMCK8Qh7KYU pYtCM9SNjxXJKuLfPzRhG6H6Z/jqf/bwUg/PCheT7iZYQxoxkUt9YhrP5bC5AF+UGJLb SdRA== 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=KzMuw4I+Nd8N8oi2Xxm8m0QPQBwYQL/tbGvCzQaub7A=; fh=IFarww2qplPjrJl7hbkk+Nq7HylZz6B3JgSh2povEMA=; b=NrfMcBMNKi5N6mJulmQQyTNO8BT7hycAkRFzgpl53KW6TYqaStzyo1GLTaxeW1QqF+ +zUZbvjKphDnZ8qx4ytbL0X/JPofClf+xZhnilGQroXq646ccGE3YBHJihl+0IDktNXi lQHNii582sOnVFaBFT4dI1AS5Q/4i3oN8MgTcbQruAtaxOM3HCKyGhqz4G9t9D7gbV+3 roP8m7G71CXvj609hF+WX4eu4yBmXxIktyC1829/CdUPAYxCN3HpWCGFPmfjd0ZzrHRN GG7a4Pdh1S6Ni3KSrvRHc4fQLsmsO1C22yGsiq2zBhFztZVUqkCjZDvyTbnLbuIOSuwT ZpzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=M79vWm+R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id o24-20020a639218000000b005898c065015si8328111pgd.228.2023.10.09.15.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:05:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=M79vWm+R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 97E6F81C900B; Mon, 9 Oct 2023 15:05:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378855AbjJIWEx (ORCPT + 19 others); Mon, 9 Oct 2023 18:04:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378830AbjJIWEs (ORCPT ); Mon, 9 Oct 2023 18:04:48 -0400 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0E42D6 for ; Mon, 9 Oct 2023 15:04:42 -0700 (PDT) Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-351574aca7bso16847485ab.3 for ; Mon, 09 Oct 2023 15:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696889082; x=1697493882; 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=KzMuw4I+Nd8N8oi2Xxm8m0QPQBwYQL/tbGvCzQaub7A=; b=M79vWm+ReC50aLzytD5ElBjwafChrifxWBUUHjdM/oiwIIn0JpbNNGIOinmaCmmlVl g++16RL3lyOTQ+rG62yAA2nKNRHwZsoKflNznyq0LuEPlAt6jNbSlQICHhJDY824RVHs HrIwuuGPX3T8tp2DG4D2hWeSSGpKG9aXIidhk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696889082; x=1697493882; 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=KzMuw4I+Nd8N8oi2Xxm8m0QPQBwYQL/tbGvCzQaub7A=; b=Az/zWKF8fxBTsQuYTjC9qyglFHAl4gwIA5zleaENdeUVswsFFzQyyIrRcNcGOlx17B 2dV0lNKu/Ps7JQhOqZ4eg7e2FBb3GCds2j990s9YibFGX8Zdydvl25WpXy97sRSry25e 9pbVE6Z/LPqthwFCVtFsbXchV2sNW2ufbVXcb6uwUA8OyozBohJGt3eu/V2UqB7yPSQL DdVl+6Z5BUx8BCqOi9qvg6zg4zL69z8yE8eA3u9nHYw6zvRspGtA/7EjAQI+lGuTuHt4 PG4bqEw1u8ojIdV3oqtRJYYZCXtWTgiFXsnjnHuNEmBZsAVFR8f9ciljdkvuR+7+8Uec dF8w== X-Gm-Message-State: AOJu0YzzEKvsRi/oN9N3Bg3PVwQJlLt9Tbj8qClk0LCki3gpdFBd82/v CYGfc6zoRm07zHOutLHkgtT6IQ== X-Received: by 2002:a05:6e02:1a2e:b0:351:4f0c:b95d with SMTP id g14-20020a056e021a2e00b003514f0cb95dmr20621948ile.22.1696889082165; Mon, 09 Oct 2023 15:04:42 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:138c:cf57:c18d:20f5]) by smtp.gmail.com with ESMTPSA id o3-20020a92d4c3000000b0034cd2c0afe8sm3164063ilm.56.2023.10.09.15.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:04:41 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: linux-mtd@lists.infradead.org, Miquel Raynal , Michael Walle , Rob Herring , U-Boot Mailing List , Tom Rini , Simon Glass , Conor Dooley , Krzysztof Kozlowski , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] dt-bindings: mtd: binman-partitions: Add alignment properties Date: Mon, 9 Oct 2023 16:04:15 -0600 Message-ID: <20231009220436.2164245-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.609.gbb76f46606-goog In-Reply-To: <20231009220436.2164245-1-sjg@chromium.org> References: <20231009220436.2164245-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email 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 (morse.vger.email [0.0.0.0]); Mon, 09 Oct 2023 15:05:08 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779317196656108804 X-GMAIL-MSGID: 1779317196656108804 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 'binman' 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 --- (no changes since v2) 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 35a320359ec1..8e8a3b6d4d14 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml @@ -28,6 +28,42 @@ properties: - const: u-boot # u-boot.bin from U-Boot project - const: 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: @@ -40,10 +76,13 @@ examples: partition@100000 { compatible = "u-boot"; reg = <0x100000 0xf00000>; + align-size = <0x1000>; + align-end = <0x10000>; }; partition@200000 { compatible = "atf-bl31"; reg = <0x200000 0x100000>; + align = <0x4000>; }; };