[U-Boot,v2,5/5] common: move init_helpers.h prototypes in init.h

Message ID 1520945824-10620-6-git-send-email-patrick.delaunay@st.com
State Accepted
Commit b8aa55cb6414e512cce30bb7db3268eea934466d
Delegated to: Tom Rini
Headers show
Series
  • common: move startup function prototypes in init.h
Related show

Commit Message

Patrick DELAUNAY March 13, 2018, 12:57 p.m.
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

Comments

Tom Rini March 18, 2018, 2:57 p.m. | #1
On Tue, Mar 13, 2018 at 01:57:04PM +0100, Patrick Delaunay wrote:

> 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>

Applied to u-boot/master, thanks!

Patch

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 832a5d7..7c32245 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 4df52f1..62588c5 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 482f506..89f2e16 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 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_ */