common: Drop asm/global_data.h from common header

[J-u-boot.git] / arch / arm / mach-meson / board-common.c

diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 6c77e379669644b83531894ae88fd180055482ff..34b3c8f399dd9a2d37c164745335bc20d753d0e5 100644 (file)
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -4,8 +4,15 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
+#include <fastboot.h>
+#include <init.h>
+#include <net.h>
 #include <asm/arch/boot.h>
 #include <env.h>
+#include <asm/cache.h>
+#include <asm/global_data.h>
+#include <asm/ptrace.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
 #include <asm/arch/mem.h>
@@ -47,12 +54,12 @@ int dram_init(void)
        return 0;
 }
 
-__weak int meson_ft_board_setup(void *blob, bd_t *bd)
+__weak int meson_ft_board_setup(void *blob, struct bd_info *bd)
 {
        return 0;
 }
 
-int ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, struct bd_info *bd)
 {
        meson_init_reserved_memory(blob);
 
@@ -67,11 +74,8 @@ void meson_board_add_reserved_memory(void *fdt, u64 start, u64 size)
        if (ret)
                printf("Could not reserve zone @ 0x%llx\n", start);
 
-       if (IS_ENABLED(CONFIG_EFI_LOADER)) {
-               efi_add_memory_map(start,
-                                  ALIGN(size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT,
-                                  EFI_RESERVED_MEMORY_TYPE, false);
-       }
+       if (IS_ENABLED(CONFIG_EFI_LOADER))
+               efi_add_memory_map(start, size, EFI_RESERVED_MEMORY_TYPE);
 }
 
 int meson_generate_serial_ethaddr(void)
@@ -151,8 +155,11 @@ int board_late_init(void)
 #if CONFIG_IS_ENABLED(FASTBOOT)
 static unsigned int reboot_reason = REBOOT_REASON_NORMAL;
 
-int fastboot_set_reboot_flag()
+int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
 {
+       if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
+               return -ENOTSUPP;
+
        reboot_reason = REBOOT_REASON_BOOTLOADER;
 
        printf("Using reboot reason: 0x%x\n", reboot_reason);