From 49c59dd5ca3078a135f85bcd1cb00e57029a1cde Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 6 Sep 2023 23:29:44 +0200 Subject: common: board_r: Remove unused NEEDS_MANUAL_RELOC code bits The last user of the NEEDS_MANUAL_RELOC has been removed in commit 26af162ac8f8 ("arch: m68k: Implement relocation") Remove now unused NEEDS_MANUAL_RELOC code. Signed-off-by: Marek Vasut --- include/relocate.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'include/relocate.h') diff --git a/include/relocate.h b/include/relocate.h index 2dbfd901e4f..5ae1a2ed555 100644 --- a/include/relocate.h +++ b/include/relocate.h @@ -50,17 +50,7 @@ int do_elf_reloc_fixups(void); */ 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; + 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_ */ -- cgit v1.2.3 From ba377a6c2c4e9907a198837366bd80c032432bc7 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 6 Sep 2023 23:29:59 +0200 Subject: image: Remove unused NEEDS_MANUAL_RELOC code bits The last user of the NEEDS_MANUAL_RELOC has been removed in commit 26af162ac8f8 ("arch: m68k: Implement relocation") Remove now unused NEEDS_MANUAL_RELOC code. Signed-off-by: Marek Vasut --- include/relocate.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'include/relocate.h') diff --git a/include/relocate.h b/include/relocate.h index 5ae1a2ed555..8ca25e1105e 100644 --- a/include/relocate.h +++ b/include/relocate.h @@ -39,18 +39,4 @@ int clear_bss(void); */ 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) -{ - return ptr; -} - #endif /* _RELOCATE_H_ */ -- cgit v1.2.3