The lmb_alloc_base() returns phys_addr_t , map_sysmem() accepts
phys_addr_t as first parameter. Declare 'addr' as phys_addr_t and
get rid of the casts.

Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Reported-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Signed-off-by: Marek Vasut <marek.vasut+rene...@mailbox.org>
---
Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
Cc: Kuninori Morimoto <kuninori.morimoto...@renesas.com>
Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Cc: Simon Glass <s...@chromium.org>
Cc: Tom Rini <tr...@konsulko.com>
---
V2: - Replace $addr with 'addr' to somehow delimit the variable name
V3: - Add RB from Laurent
V4: No change
---
 boot/image-fdt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boot/image-fdt.c b/boot/image-fdt.c
index c2571b22244..c37442c9130 100644
--- a/boot/image-fdt.c
+++ b/boot/image-fdt.c
@@ -162,6 +162,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, 
ulong *of_size)
        void    *of_start = NULL;
        phys_addr_t start, size, usable;
        char    *fdt_high;
+       phys_addr_t addr;
        phys_addr_t low;
        phys_size_t mapsize;
        ulong   of_len = 0;
@@ -186,7 +187,6 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, 
ulong *of_size)
        fdt_high = env_get("fdt_high");
        if (fdt_high) {
                ulong desired_addr = hextoul(fdt_high, NULL);
-               ulong addr;
 
                if (desired_addr == ~0UL) {
                        /* All ones means use fdt in place */
@@ -224,8 +224,8 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, 
ulong *of_size)
                         * At least part of this DRAM bank is usable, try
                         * using it for LMB allocation.
                         */
-                       of_start = map_sysmem((ulong)lmb_alloc_base(lmb,
-                                   of_len, 0x1000, usable), of_len);
+                       addr = lmb_alloc_base(lmb, of_len, 0x1000, usable);
+                       of_start = map_sysmem(addr, of_len);
                        /* Allocation succeeded, use this block. */
                        if (of_start != NULL)
                                break;
-- 
2.43.0

Reply via email to