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 26682da955fd41e646c9cc9ea0ca5394b9aab1e7..8ca25e1105e6b9536d4df82c1e413e8bea232b6b 100644 (file)
--- a/include/relocate.h
+++ b/include/relocate.h
@@ -16,7 +16,7 @@ DECLARE_GLOBAL_DATA_PTR;
 /**
  * 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);
 
@@ -25,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);
 
@@ -35,32 +35,8 @@ 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);
 
-/**
- * manual_reloc() - Manually relocate a pointer if needed
- *
- * This is a nop in almost all cases, except for the systems with a broken gcc
- * which need to manually relocate some things.
- *
- * @ptr: Pointer to relocate
- * @return new pointer value
- */
-static inline void *manual_reloc(void *ptr)
-{
-#ifndef USE_HOSTCC
-       if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
-               return ptr + gd->reloc_off;
-#endif
-               return ptr;
-}
-
-#if !defined(USE_HOSTCC) && defined(CONFIG_NEEDS_MANUAL_RELOC)
-#define MANUAL_RELOC(ptr)      (ptr) = manual_reloc(ptr)
-#else
-#define MANUAL_RELOC(ptr)      (void)(ptr)
-#endif
-
 #endif /* _RELOCATE_H_ */