@@ -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>
@@ -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>
@@ -23,7 +23,6 @@
#include <fdtdec.h>
#include <ide.h>
#include <initcall.h>
-#include <init_helpers.h>
#ifdef CONFIG_PS2KBD
#include <keyboard.h>
#endif
@@ -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);
deleted file mode 100644
@@ -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_ */
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> --- modification introduced after Tom Rimi review of V1 Changes in v2: None arch/x86/lib/spl.c | 1 - common/board_f.c | 1 - common/board_r.c | 1 - include/init.h | 7 +++++++ include/init_helpers.h | 18 ------------------ 5 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 include/init_helpers.h