This header file is used by three archs. It could be used by all of them since relocation is a common function. Move it into a generic file.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arc/include/asm/relocate.h | 16 ---------------- arch/x86/include/asm/relocate.h | 17 ----------------- arch/x86/lib/relocate.c | 2 +- arch/xtensa/include/asm/relocate.h | 14 -------------- arch/xtensa/lib/relocate.c | 2 +- common/board_f.c | 4 +--- include/relocate.h | 39 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 42 insertions(+), 52 deletions(-) delete mode 100644 arch/arc/include/asm/relocate.h delete mode 100644 arch/x86/include/asm/relocate.h delete mode 100644 arch/xtensa/include/asm/relocate.h create mode 100644 include/relocate.h
diff --git a/arch/arc/include/asm/relocate.h b/arch/arc/include/asm/relocate.h deleted file mode 100644 index 4c5f923416..0000000000 --- a/arch/arc/include/asm/relocate.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _ASM_ARC_RELOCATE_H -#define _ASM_ARC_RELOCATE_H - -#include <common.h> - -int copy_uboot_to_ram(void); -int clear_bss(void); -int do_elf_reloc_fixups(void); - -#endif /* _ASM_ARC_RELOCATE_H */ diff --git a/arch/x86/include/asm/relocate.h b/arch/x86/include/asm/relocate.h deleted file mode 100644 index cff3abc23a..0000000000 --- a/arch/x86/include/asm/relocate.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * (C) Copyright 2011 - * Graeme Russ, graeme.russ@gmail.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _RELOCATE_H_ -#define _RELOCATE_H_ - -#include <common.h> - -int copy_uboot_to_ram(void); -int clear_bss(void); -int do_elf_reloc_fixups(void); - -#endif /* !_RELOCATE_H_ */ diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index 1da5210d27..114f602f7a 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -17,8 +17,8 @@
#include <common.h> #include <inttypes.h> +#include <relocate.h> #include <asm/u-boot-x86.h> -#include <asm/relocate.h> #include <asm/sections.h> #include <elf.h>
diff --git a/arch/xtensa/include/asm/relocate.h b/arch/xtensa/include/asm/relocate.h deleted file mode 100644 index 9c4ce23988..0000000000 --- a/arch/xtensa/include/asm/relocate.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2016 Cadence Design Systems Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _ASM_XTENSA_RELOCATE_H -#define _ASM_XTENSA_RELOCATE_H - -#include <common.h> - -int clear_bss(void); - -#endif /* _ASM_XTENSA_RELOCATE_H */ diff --git a/arch/xtensa/lib/relocate.c b/arch/xtensa/lib/relocate.c index 3f747ec55a..010c1b035e 100644 --- a/arch/xtensa/lib/relocate.c +++ b/arch/xtensa/lib/relocate.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-2.0+ */
-#include <asm/relocate.h> +#include <relocate.h> #include <asm/sections.h> #include <asm/string.h>
diff --git a/common/board_f.c b/common/board_f.c index 1b6c2b9789..bbcf6f4fe5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -39,6 +39,7 @@
#include <os.h> #include <post.h> +#include <relocate.h> #include <spi.h> #include <status_led.h> #include <timer.h> @@ -47,9 +48,6 @@ #include <watchdog.h> #include <asm/io.h> #include <asm/sections.h> -#if defined(CONFIG_X86) || defined(CONFIG_ARC) || defined(CONFIG_XTENSA) -#include <asm/relocate.h> -#endif #include <dm/root.h> #include <linux/errno.h>
diff --git a/include/relocate.h b/include/relocate.h new file mode 100644 index 0000000000..0d4b27aa2b --- /dev/null +++ b/include/relocate.h @@ -0,0 +1,39 @@ +/* + * (C) Copyright 2011 + * Graeme Russ, graeme.russ@gmail.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _RELOCATE_H_ +#define _RELOCATE_H_ + +#include <common.h> + +/** + * copy_uboot_to_ram() - Copy U-Boot to its new relocated position + * + * @return 0 if OK, -ve on error + */ +int copy_uboot_to_ram(void); + +/** + * clear_bss() - Clear the BSS (Blocked Start by Symbol) segment + * + * This clears the memory used by global variables + * + * @return 0 if OK, -ve on error + */ +int clear_bss(void); + +/** + * do_elf_reloc_fixups() - Fix up ELF relocations in the relocated code + * + * This processes the relocation tables to ensure that the code can run in its + * new location. + * + * @return 0 if OK, -ve on error + */ +int do_elf_reloc_fixups(void); + +#endif /* _RELOCATE_H_ */