configs: MPC8548CDS: enable DM_I2C

[oweals/u-boot.git] / cmd / bootefi.c

diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 3bbe2d6a1a40ca344e4ca5c7ccc8f68ecda612fe..54b4b8f98455a8af7ccb60abcf1ae8074d45d032 100644 (file)
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -199,7 +199,8 @@ static void efi_carve_out_dt_rsv(void *fdt)
                         * The /reserved-memory node may have children with
                         * a size instead of a reg property.
                         */
-                       if (addr != FDT_ADDR_T_NONE)
+                       if (addr != FDT_ADDR_T_NONE &&
+                           fdtdec_get_is_enabled(fdt, subnode))
                                efi_reserve_memory(addr, size);
                        subnode = fdt_next_subnode(fdt, subnode);
                }
@@ -480,10 +481,8 @@ efi_status_t efi_run_image(void *source_buffer, efi_uintn_t source_size)
        ret = do_bootefi_exec(handle);
 
 out:
-       if (mem_handle)
-               efi_delete_handle(mem_handle);
-       if (file_path)
-               efi_free_pool(file_path);
+       efi_delete_handle(mem_handle);
+       efi_free_pool(file_path);
        return ret;
 }