aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPatrick Delaunay <patrick.delaunay@st.com>2018-03-13 13:57:04 +0100
committerTom Rini <trini@konsulko.com>2018-03-16 14:56:59 -0400
commitb8aa55cb6414e512cce30bb7db3268eea934466d (patch)
treed43724e4a442a582cef8fecf31fa3d1a2a50eafa /include
parentfc22ee215a1385ddaefd01e01975b6a67d9d8072 (diff)
downloadu-boot-b8aa55cb6414e512cce30bb7db3268eea934466d.zip
u-boot-b8aa55cb6414e512cce30bb7db3268eea934466d.tar.gz
u-boot-b8aa55cb6414e512cce30bb7db3268eea934466d.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/init.h7
-rw-r--r--include/init_helpers.h18
2 files changed, 7 insertions, 18 deletions
diff --git a/include/init.h b/include/init.h
index d54d519..147ae6b 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 3efcfdd..0000000
--- 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_ */