diff options
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part_efi.c | 8 | ||||
| -rw-r--r-- | disk/part_iso.c | 2 |
2 files changed, 4 insertions, 6 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; diff --git a/disk/part_iso.c b/disk/part_iso.c index 822f2c4d9f4..1061f341d35 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -220,7 +220,7 @@ static void part_print_iso(struct blk_desc *dev_desc) printf("Part Start Sect x Size Type\n"); i=1; do { - printf(" %2d " LBAFU " " LBAFU " %6ld %.32s\n", + printf(" %2d %8" LBAFlength "u %8" LBAFlength "u %6ld %.32s\n", i, info.start, info.size, info.blksz, info.type); i++; } while (part_get_info_iso_verb(dev_desc, i, &info, 0) != -1); |