Merge tag 'v2025.01-rc6' into next

[J-u-boot.git] / include / relocate.h

diff --git a/include/relocate.h b/include/relocate.h
index 0d4b27aa2bdbe018d54eb49fdd511cb48dc6679c..8ca25e1105e6b9536d4df82c1e413e8bea232b6b 100644 (file)
--- a/include/relocate.h
+++ b/include/relocate.h
@@ -1,19 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2011
  * Graeme Russ, <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _RELOCATE_H_
 #define _RELOCATE_H_
 
-#include <common.h>
+#ifndef USE_HOSTCC
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+#endif
 
 /**
  * copy_uboot_to_ram() - Copy U-Boot to its new relocated position
  *
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
  */
 int copy_uboot_to_ram(void);
 
@@ -22,7 +25,7 @@ int copy_uboot_to_ram(void);
  *
  * This clears the memory used by global variables
  *
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
  */
 int clear_bss(void);
 
@@ -32,7 +35,7 @@ int clear_bss(void);
  * This processes the relocation tables to ensure that the code can run in its
  * new location.
  *
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
  */
 int do_elf_reloc_fixups(void);