| Message ID | 20240320052449.175786-2-sjg@chromium.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v9,1/2] dt-bindings: mtd: fixed-partitions: Add alignment properties | expand |
On Wed, Mar 20, 2024 at 06:24:49PM +1300, Simon Glass wrote: > Add two compatibles 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. > > Note also that, after discussion on v6, we decided to use the same > 'fixed-partition' schema for the binman features, so this version > adds a new 'binman.yaml' file providing the new compatibles to the > existing partition.yaml binding. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > (no changes since v8) > > Changes in v8: > - Switch the patch ordering so the partition change comes first > > Changes in v7: > - Adjust MAINTAINERS entry > - Put compatible strings into the 'fixed-partition' binding > > Changes in v5: > - Add mention of why 'binman' is the vendor > - Drop 'select: false' > - Tidy up the compatible setings > - Use 'tfa-bl31' instead of 'atf-bl31' > > 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 > > .../bindings/mtd/partitions/binman.yaml | 49 +++++++++++++++++++ > .../bindings/mtd/partitions/partition.yaml | 21 ++++++++ > MAINTAINERS | 5 ++ > 3 files changed, 75 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..83417ad5cee9 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml > @@ -0,0 +1,49 @@ > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Binman entries > + > +description: | > + TBD ? > + > +maintainers: > + - Simon Glass <sjg@chromium.org> > + > +allOf: > + - $ref: /schemas/mtd/partitions/partition.yaml# > + > +properties: > + compatible: > + enum: > + - binman,entry # generic binman entry As-is, 'binman' would need to be added to vendor-prefixes.yaml. However, I think just 'binman' would provide just as much information. But really, does it provide anything? What would be the difference between this and no compatible? Rob
Hi Rob, On Fri, 22 Mar 2024 at 02:49, Rob Herring <robh@kernel.org> wrote: > > On Wed, Mar 20, 2024 at 06:24:49PM +1300, Simon Glass wrote: > > Add two compatibles 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. > > > > Note also that, after discussion on v6, we decided to use the same > > 'fixed-partition' schema for the binman features, so this version > > adds a new 'binman.yaml' file providing the new compatibles to the > > existing partition.yaml binding. > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > --- > > > > (no changes since v8) > > > > Changes in v8: > > - Switch the patch ordering so the partition change comes first > > > > Changes in v7: > > - Adjust MAINTAINERS entry > > - Put compatible strings into the 'fixed-partition' binding > > > > Changes in v5: > > - Add mention of why 'binman' is the vendor > > - Drop 'select: false' > > - Tidy up the compatible setings > > - Use 'tfa-bl31' instead of 'atf-bl31' > > > > 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 > > > > .../bindings/mtd/partitions/binman.yaml | 49 +++++++++++++++++++ > > .../bindings/mtd/partitions/partition.yaml | 21 ++++++++ > > MAINTAINERS | 5 ++ > > 3 files changed, 75 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..83417ad5cee9 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml > > @@ -0,0 +1,49 @@ > > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Binman entries > > + > > +description: | > > + TBD > > ? Oh yes, I forgot to put that back when I reworked all these again. > > > + > > +maintainers: > > + - Simon Glass <sjg@chromium.org> > > + > > +allOf: > > + - $ref: /schemas/mtd/partitions/partition.yaml# > > + > > +properties: > > + compatible: > > + enum: > > + - binman,entry # generic binman entry > > As-is, 'binman' would need to be added to vendor-prefixes.yaml. > > However, I think just 'binman' would provide just as much information. > But really, does it provide anything? What would be the difference > between this and no compatible? In Binman this is the base class ('entry') for all entry types that it understands. I don't expect we would actually use this since it does not define what the contents are. So I can remove this line. Regards, Simon
diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml new file mode 100644 index 000000000000..83417ad5cee9 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml @@ -0,0 +1,49 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman entries + +description: | + TBD + +maintainers: + - Simon Glass <sjg@chromium.org> + +allOf: + - $ref: /schemas/mtd/partitions/partition.yaml# + +properties: + compatible: + enum: + - binman,entry # generic binman entry + - u-boot # u-boot.bin from U-Boot project + - tfa-bl31 # bl31.bin or bl31.elf from TF-A project + +required: + - compatible + +unevaluatedProperties: false + +examples: + - | + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + compatible = "u-boot"; + reg = <0x100000 0xf00000>; + align-size = <0x1000>; + align-end = <0x10000>; + }; + + partition@200000 { + compatible = "tfa-bl31"; + reg = <0x200000 0x100000>; + align = <0x4000>; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/partition.yaml b/Documentation/devicetree/bindings/mtd/partitions/partition.yaml index 39c7d7672783..3df12df06116 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partition.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partition.yaml @@ -118,3 +118,24 @@ then: # This is a generic file other binding inherit from and extend additionalProperties: true + +examples: + - | + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + compatible = "u-boot"; + reg = <0x100000 0xf00000>; + align-size = <0x1000>; + align-end = <0x10000>; + }; + + partition@200000 { + compatible = "tfa-bl31"; + reg = <0x200000 0x100000>; + align = <0x4000>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index b43102ca365d..5b08ee363140 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3610,6 +3610,11 @@ F: Documentation/filesystems/bfs.rst F: fs/bfs/ F: include/uapi/linux/bfs_fs.h +BINMAN +M: Simon Glass <sjg@chromium.org> +S: Supported +F: Documentation/devicetree/bindings/mtd/partitions/binman* + BITMAP API M: Yury Norov <yury.norov@gmail.com> R: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Add two compatibles 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. Note also that, after discussion on v6, we decided to use the same 'fixed-partition' schema for the binman features, so this version adds a new 'binman.yaml' file providing the new compatibles to the existing partition.yaml binding. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v8) Changes in v8: - Switch the patch ordering so the partition change comes first Changes in v7: - Adjust MAINTAINERS entry - Put compatible strings into the 'fixed-partition' binding Changes in v5: - Add mention of why 'binman' is the vendor - Drop 'select: false' - Tidy up the compatible setings - Use 'tfa-bl31' instead of 'atf-bl31' 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 .../bindings/mtd/partitions/binman.yaml | 49 +++++++++++++++++++ .../bindings/mtd/partitions/partition.yaml | 21 ++++++++ MAINTAINERS | 5 ++ 3 files changed, 75 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml