diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2018-03-13 13:57:04 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-03-16 14:56:59 -0400 |
| commit | b8aa55cb6414e512cce30bb7db3268eea934466d (patch) | |
| tree | d43724e4a442a582cef8fecf31fa3d1a2a50eafa | |
| parent | fc22ee215a1385ddaefd01e01975b6a67d9d8072 (diff) | |
common: move init_helpers.h prototypes in init.h
Merge init_helpers.h in the new file init.h
with only prototypes for init_cache_f_r
used in common/board_f.c
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
| -rw-r--r-- | arch/x86/lib/spl.c | 1 | ||||
| -rw-r--r-- | common/board_f.c | 1 | ||||
| -rw-r--r-- | common/board_r.c | 1 | ||||
| -rw-r--r-- | include/init.h | 7 | ||||
| -rw-r--r-- | include/init_helpers.h | 18 |
5 files changed, 7 insertions, 21 deletions
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 832a5d7c0ea..7c32245a09c 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -6,7 +6,6 @@ #include <common.h> #include <debug_uart.h> -#include <init_helpers.h> #include <spl.h> #include <asm/cpu.h> #include <asm/mtrr.h> diff --git a/common/board_f.c b/common/board_f.c index 4df52f1eb57..62588c5bad3 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -18,7 +18,6 @@ #include <fs.h> #include <i2c.h> #include <initcall.h> -#include <init_helpers.h> #include <malloc.h> #include <mapmem.h> #include <os.h> diff --git a/common/board_r.c b/common/board_r.c index 482f5066616..89f2e16b71a 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -23,7 +23,6 @@ #include <fdtdec.h> #include <ide.h> #include <initcall.h> -#include <init_helpers.h> #ifdef CONFIG_PS2KBD #include <keyboard.h> #endif diff --git a/include/init.h b/include/init.h index d54d519a69c..147ae6bb8e7 100644 --- a/include/init.h +++ b/include/init.h @@ -101,6 +101,13 @@ int dram_init_banksize(void); */ int arch_reserve_stacks(void); +/** + * init_cache_f_r() - Turn on the cache in preparation for relocation + * + * @return 0 if OK, -ve on error + */ +int init_cache_f_r(void); + int print_cpuinfo(void); int timer_init(void); int reserve_mmu(void); diff --git a/include/init_helpers.h b/include/init_helpers.h deleted file mode 100644 index 3efcfddb7b3..00000000000 --- a/include/init_helpers.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * (C) Copyright 2011 - * Graeme Russ, <graeme.russ@gmail.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _INIT_HELPERS_H_ -#define _INIT_HELPERS_H_ - -/** - * init_cache_f_r() - Turn on the cache in preparation for relocation - * - * @return 0 if OK, -ve on error - */ -int init_cache_f_r(void); - -#endif /* _INIT_HELPERS_H_ */ |