diff options
| author | Simon Glass <sjg@chromium.org> | 2017-03-31 08:40:38 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-05 16:36:57 -0400 |
| commit | e47b2d674f0acd137412535647cb3072bf11dbb0 (patch) | |
| tree | 9ebdb5b4ccc2805279bdbdb8971d1c55dcc2c0af /arch | |
| parent | 96d4b75c0d7f1bbbbde19e6225b09b1f7e7b60fe (diff) | |
board_f: Make relocation functions generic
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arc/include/asm/relocate.h | 16 | ||||
| -rw-r--r-- | arch/x86/include/asm/relocate.h | 17 | ||||
| -rw-r--r-- | arch/x86/lib/relocate.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/relocate.h | 14 | ||||
| -rw-r--r-- | arch/xtensa/lib/relocate.c | 2 |
5 files changed, 2 insertions, 49 deletions
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> |