diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-27 11:09:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-27 11:09:23 -0400 |
| commit | 1d1f98c8eed7bb4792300e655c2cb70136928f74 (patch) | |
| tree | d08df140d52bd1298fa0e81ce908e2e09a880e5d /disk/part_efi.c | |
| parent | e908d20fcbd847e17345591fc171b59d9a156516 (diff) | |
| parent | 933bf2644591281ed96f9d5771cbb35fe95bcb00 (diff) | |
Merge tag 'dm-pull-next-27sep21' of https://source.denx.de/u-boot/custodians/u-boot-dm into next
Various of-platdata improvements, including CONFIG_OF_REAL
Diffstat (limited to 'disk/part_efi.c')
| -rw-r--r-- | disk/part_efi.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index fdca91a6974..0ca7effc327 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -23,12 +23,11 @@ #include <malloc.h> #include <memalign.h> #include <part_efi.h> +#include <dm/ofnode.h> #include <linux/compiler.h> #include <linux/ctype.h> #include <u-boot/crc.h> -DECLARE_GLOBAL_DATA_PTR; - #ifdef CONFIG_HAVE_BLOCK_DEVICE /* GUID for basic data partitons */ @@ -563,9 +562,8 @@ static uint32_t partition_entries_offset(struct blk_desc *dev_desc) * from the start of the device) to be specified as a property * of the device tree '/config' node. */ - config_offset = fdtdec_get_config_int(gd->fdt_blob, - "u-boot,efi-partition-entries-offset", - -EINVAL); + config_offset = ofnode_conf_read_int( + "u-boot,efi-partition-entries-offset", -EINVAL); if (config_offset != -EINVAL) { offset_bytes = PAD_TO_BLOCKSIZE(config_offset, dev_desc); offset_blks = offset_bytes / dev_desc->blksz; |