diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-30 04:03:38 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-30 04:03:38 +0300 |
| commit | 8ddaf943589756442bba21e5be645cd47526d82b (patch) | |
| tree | 5790a6435ce416342bc9747a55d2f23a8f141c2e /include | |
| parent | f3a0d2c1af630cc09a34c2159aa2dfa12b831762 (diff) | |
| parent | 5b700cdcff61426843405ca1df4b549237e8bbc2 (diff) | |
| download | u-boot-8ddaf943589756442bba21e5be645cd47526d82b.tar.xz | |
Merge tag 'dm-pull-29apr21' of https://source.denx.de/u-boot/custodians/u-boot-dm
buildman environment fix
binman FMAP improvements
minor test improvements and fixes
minor dm improvements
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/ofnode.h | 10 | ||||
| -rw-r--r-- | include/fdtdec.h | 5 | ||||
| -rw-r--r-- | include/tpm-v2.h | 24 |
3 files changed, 29 insertions, 10 deletions
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 2c0597c407..8a69fd87da 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -511,6 +511,16 @@ phys_addr_t ofnode_get_addr_index(ofnode node, int index); phys_addr_t ofnode_get_addr(ofnode node); /** + * ofnode_get_size() - get size from a node + * + * This reads the register size from a node + * + * @node: node to read from + * @return size of the address, or FDT_SIZE_T_NONE if not present or invalid + */ +fdt_size_t ofnode_get_size(ofnode node); + +/** * ofnode_stringlist_search() - find a string in a string list and return index * * Note that it is possible for this function to succeed on property values diff --git a/include/fdtdec.h b/include/fdtdec.h index 62d1660973..e0a49b1e57 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -24,15 +24,16 @@ typedef phys_addr_t fdt_addr_t; typedef phys_size_t fdt_size_t; -#ifdef CONFIG_PHYS_64BIT #define FDT_ADDR_T_NONE (-1U) +#define FDT_SIZE_T_NONE (-1U) + +#ifdef CONFIG_PHYS_64BIT #define fdt_addr_to_cpu(reg) be64_to_cpu(reg) #define fdt_size_to_cpu(reg) be64_to_cpu(reg) #define cpu_to_fdt_addr(reg) cpu_to_be64(reg) #define cpu_to_fdt_size(reg) cpu_to_be64(reg) typedef fdt64_t fdt_val_t; #else -#define FDT_ADDR_T_NONE (-1U) #define fdt_addr_to_cpu(reg) be32_to_cpu(reg) #define fdt_size_to_cpu(reg) be32_to_cpu(reg) #define cpu_to_fdt_addr(reg) cpu_to_be32(reg) diff --git a/include/tpm-v2.h b/include/tpm-v2.h index df67a196cf..7de7d6a57d 100644 --- a/include/tpm-v2.h +++ b/include/tpm-v2.h @@ -53,14 +53,22 @@ struct udevice; #define TPM2_PT_MAX_COMMAND_SIZE (u32)(TPM2_PT_FIXED + 30) #define TPM2_PT_MAX_RESPONSE_SIZE (u32)(TPM2_PT_FIXED + 31) -/* event types */ -#define EV_POST_CODE ((u32)0x00000001) -#define EV_NO_ACTION ((u32)0x00000003) -#define EV_SEPARATOR ((u32)0x00000004) -#define EV_S_CRTM_CONTENTS ((u32)0x00000007) -#define EV_S_CRTM_VERSION ((u32)0x00000008) -#define EV_CPU_MICROCODE ((u32)0x00000009) -#define EV_TABLE_OF_DEVICES ((u32)0x0000000B) +/* + * event types, cf. + * "TCG Server Management Domain Firmware Profile Specification", + * rev 1.00, 2020-05-01 + */ +#define EV_POST_CODE ((u32)0x00000001) +#define EV_NO_ACTION ((u32)0x00000003) +#define EV_SEPARATOR ((u32)0x00000004) +#define EV_ACTION ((u32)0x00000005) +#define EV_TAG ((u32)0x00000006) +#define EV_S_CRTM_CONTENTS ((u32)0x00000007) +#define EV_S_CRTM_VERSION ((u32)0x00000008) +#define EV_CPU_MICROCODE ((u32)0x00000009) +#define EV_PLATFORM_CONFIG_FLAGS ((u32)0x0000000A) +#define EV_TABLE_OF_DEVICES ((u32)0x0000000B) +#define EV_COMPACT_HASH ((u32)0x0000000C) /* TPMS_TAGGED_PROPERTY Structure */ struct tpms_tagged_property { |