From c95c9ad63c51f8d9cfb258e6f17a8001efab6d64 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 8 Mar 2024 11:22:30 -0600 Subject: [PATCH] schemas: chosen: Change address+size properties' type to 'address' The existing schemas for address+size properties aren't really correct and differ compared to 'reg'. They also aren't getting decoded to the correct sizes which results in false warnings. Use the new 'address' type for all the address+size properties in /chosen. Signed-off-by: Rob Herring --- dtschema/schemas/chosen.yaml | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dtschema/schemas/chosen.yaml b/dtschema/schemas/chosen.yaml index 3aa28df..5e73d77 100644 --- a/dtschema/schemas/chosen.yaml +++ b/dtschema/schemas/chosen.yaml @@ -75,10 +75,8 @@ properties: a different secondary CPU release mechanism). linux,elfcorehdr: - oneOf: - - $ref: types.yaml#/definitions/uint32-array - - $ref: types.yaml#/definitions/uint64-array - maxItems: 2 + $ref: types.yaml#/definitions/address + maxItems: 1 description: | This property holds the memory range, the address and the size, of the elf core header which mainly describes the panicked kernel\'s memory @@ -95,10 +93,8 @@ properties: respectively, of the root node. linux,usable-memory-range: - oneOf: - - $ref: types.yaml#/definitions/uint32-array - - $ref: types.yaml#/definitions/uint64-array - maxItems: 2 + $ref: types.yaml#/definitions/address + maxItems: 1 description: | This property holds a base address and size, describing a limited region in which memory may be considered available for use by the kernel. Memory @@ -124,18 +120,16 @@ properties: respectively, of the root node. linux,initrd-start: - oneOf: - - $ref: types.yaml#/definitions/uint32 - - $ref: types.yaml#/definitions/uint64 + $ref: types.yaml#/definitions/address + maxItems: 1 description: These properties hold the physical start and end address of an initrd that\'s loaded by the bootloader. Note that linux,initrd-start is inclusive, but linux,initrd-end is exclusive. linux,initrd-end: - oneOf: - - $ref: types.yaml#/definitions/uint32 - - $ref: types.yaml#/definitions/uint64 + $ref: types.yaml#/definitions/address + maxItems: 1 description: These properties hold the physical start and end address of an initrd that\'s loaded by the bootloader. Note that linux,initrd-start is inclusive, but @@ -191,10 +185,8 @@ properties: should only use the "stdout-path" property. linux,ima-kexec-buffer: - oneOf: - - $ref: types.yaml#/definitions/uint32-array - - $ref: types.yaml#/definitions/uint64-array - maxItems: 2 + $ref: types.yaml#/definitions/address + maxItems: 1 description: | This property(currently used by powerpc, arm64) holds the memory range, "the address and the size", of the Integrity Measurement Architecture(IMA) @@ -211,10 +203,8 @@ properties: #address-cells and #size-cells, respectively of the root node. linux,tpm-kexec-buffer: - oneOf: - - $ref: types.yaml#/definitions/uint32-array - - $ref: types.yaml#/definitions/uint64-array - maxItems: 2 + $ref: types.yaml#/definitions/address + maxItems: 1 description: | This property (currently used by powerpc64) holds the memory range, "the address and the size", of the TPM's measurement log that is being