Merge patch series "Fix device removal order for Apple dart iommu"

[J-u-boot.git] / common / board_r.c

diff --git a/common/board_r.c b/common/board_r.c
index 1acad069d929b045625778a3ebbd0dc60776e1f3..62228a723e12f8742437acae380e82f79903a8f5 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -32,6 +32,7 @@
 #include <command.h>
 #include <console.h>
 #include <dm.h>
+#include <efi_loader.h>
 #include <env.h>
 #include <env_internal.h>
 #include <fdtdec.h>
@@ -63,10 +64,8 @@
 #include <dm/ofnode.h>
 #include <linux/compiler.h>
 #include <linux/err.h>
-#include <efi_loader.h>
 #include <wdt.h>
 #include <asm-generic/gpio.h>
-#include <efi_loader.h>
 #include <relocate.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -204,8 +203,7 @@ static int initr_malloc(void)
         */
        start = gd->relocaddr - TOTAL_MALLOC_LEN;
        gd_set_malloc_start(start);
-       mem_malloc_init((ulong)map_sysmem(start, TOTAL_MALLOC_LEN),
-                       TOTAL_MALLOC_LEN);
+       mem_malloc_init(start, TOTAL_MALLOC_LEN);
        return 0;
 }
 
@@ -484,7 +482,7 @@ static int initr_boot_led_on(void)
        return 0;
 }
 
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET)
 static int initr_net(void)
 {
        puts("Net:   ");
@@ -749,7 +747,7 @@ static init_fnc_t init_sequence_r[] = {
 #ifdef CONFIG_PCI_ENDPOINT
        pci_ep_init,
 #endif
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET)
        INIT_FUNC_WATCHDOG_RESET
        initr_net,
 #endif