diff options
| author | Tom Rini | 2019-11-01 09:34:35 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-11-01 09:34:35 -0400 |
| commit | bb1bb4bb5df9df4d3f07e39a632daaff79e4b77e (patch) | |
| tree | 1ed8d0b3622961997a32cd648d5d1bd3de7a855a /include | |
| parent | 82679624f9aa6d1be733c46f3555d5166b6f5b72 (diff) | |
| parent | d60ae4c59df55c08dc96202ff58fed21ab3afb7d (diff) | |
Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm
- Fix for patman with email addresses containing commas
- Bootstage improvements for TPL, SPL
- Various sandbox and dm improvements and fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootstage.h | 2 | ||||
| -rw-r--r-- | include/linux/libfdt_env.h | 1 | ||||
| -rw-r--r-- | include/regmap.h | 3 | ||||
| -rw-r--r-- | include/test/ut.h | 3 |
4 files changed, 7 insertions, 2 deletions
diff --git a/include/bootstage.h b/include/bootstage.h index 5e7e242b834..d105ae01813 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -170,6 +170,8 @@ enum bootstage_id { * rough boot timing information. */ BOOTSTAGE_ID_AWAKE, + BOOTSTAGE_ID_START_TPL, + BOOTSTAGE_ID_END_TPL, BOOTSTAGE_ID_START_SPL, BOOTSTAGE_ID_END_SPL, BOOTSTAGE_ID_START_UBOOT_F, diff --git a/include/linux/libfdt_env.h b/include/linux/libfdt_env.h index e2bf79c7ee8..e49fcd72bd6 100644 --- a/include/linux/libfdt_env.h +++ b/include/linux/libfdt_env.h @@ -16,6 +16,7 @@ typedef __be16 fdt16_t; typedef __be32 fdt32_t; typedef __be64 fdt64_t; +typedef __be64 unaligned_fdt64_t __aligned(4); #define fdt32_to_cpu(x) be32_to_cpu(x) #define cpu_to_fdt32(x) cpu_to_be32(x) diff --git a/include/regmap.h b/include/regmap.h index 0854200a9c1..9ada1af5ef0 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -295,7 +295,8 @@ int regmap_raw_read_range(struct regmap *map, uint range_num, uint offset, * @map: The map returned by regmap_init_mem*() * @offset: Offset of the memory * @mask: Mask to apply to the read value - * @val: Value to apply to the value to write + * @val: Value to OR with the read value after masking. Note that any + * bits set in @val which are not set in @mask are ignored * Return: 0 if OK, -ve on error */ int regmap_update_bits(struct regmap *map, uint offset, uint mask, uint val); diff --git a/include/test/ut.h b/include/test/ut.h index 19bcb8c3748..fbfde10719f 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -61,7 +61,8 @@ void ut_failf(struct unit_test_state *uts, const char *fname, int line, if (val1 != val2) { \ ut_failf(uts, __FILE__, __LINE__, __func__, \ #expr1 " == " #expr2, \ - "Expected %d, got %d", val1, val2); \ + "Expected %#x (%d), got %#x (%d)", val1, val1, \ + val2, val2); \ return CMD_RET_FAILURE; \ } \ } |