소스 검색

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>
Patrick Delaunay 7 년 전
부모
커밋
b8aa55cb64
5개의 변경된 파일7개의 추가작업 그리고 21개의 파일을 삭제
  1. 0 1
      arch/x86/lib/spl.c
  2. 0 1
      common/board_f.c
  3. 0 1
      common/board_r.c
  4. 7 0
      include/init.h
  5. 0 18
      include/init_helpers.h

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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

+ 7 - 0
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);

+ 0 - 18
include/init_helpers.h

@@ -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_ */