common: fdt: Remove additional 4k space for fdt allocation

[platform/kernel/u-boot.git] / common / board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index bae4267..dcad551 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <bloblist.h>
+#include <bootstage.h>
 #include <clock_legacy.h>
 #include <console.h>
 #include <cpu.h>
@@ -25,6 +26,7 @@
 #include <init.h>
 #include <initcall.h>
 #include <lcd.h>
+#include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <os.h>
@@ -535,7 +537,7 @@ static int reserve_fdt(void)
         * will be relocated with other data.
         */
        if (gd->fdt_blob) {
-               gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
+               gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 32);
 
                gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size);
                gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size);
@@ -823,9 +825,9 @@ static int initf_dm(void)
 #if defined(CONFIG_DM) && CONFIG_VAL(SYS_MALLOC_F_LEN)
        int ret;
 
-       bootstage_start(BOOTSTATE_ID_ACCUM_DM_F, "dm_f");
+       bootstage_start(BOOTSTAGE_ID_ACCUM_DM_F, "dm_f");
        ret = dm_init_and_scan(true);
-       bootstage_accum(BOOTSTATE_ID_ACCUM_DM_F);
+       bootstage_accum(BOOTSTAGE_ID_ACCUM_DM_F);
        if (ret)
                return ret;
 #endif