From 96d4b75c0d7f1bbbbde19e6225b09b1f7e7b60fe Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Fri, 31 Mar 2017 08:40:37 -0600
Subject: [PATCH] board_f: Make init_helpers generic

This header file is used by two archs. It could be used by all of them
since it allows the cache to be on during relocation. Move it into a
generic file.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/arc/include/asm/init_helpers.h              | 12 ------------
 arch/x86/lib/spl.c                               |  2 +-
 common/board_f.c                                 |  4 +---
 common/board_r.c                                 |  4 +---
 {arch/x86/include/asm => include}/init_helpers.h |  7 ++++++-
 5 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 arch/arc/include/asm/init_helpers.h
 rename {arch/x86/include/asm => include}/init_helpers.h (56%)

diff --git a/arch/arc/include/asm/init_helpers.h b/arch/arc/include/asm/init_helpers.h
deleted file mode 100644
index 7607e19561..0000000000
--- a/arch/arc/include/asm/init_helpers.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef _ASM_ARC_INIT_HELPERS_H
-#define _ASM_ARC_INIT_HELPERS_H
-
-int init_cache_f_r(void);
-
-#endif	/* _ASM_ARC_INIT_HELPERS_H */
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index ed2d40b552..2b1b450737 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -6,9 +6,9 @@
 
 #include <common.h>
 #include <debug_uart.h>
+#include <init_helpers.h>
 #include <spl.h>
 #include <asm/cpu.h>
-#include <asm/init_helpers.h>
 #include <asm/mtrr.h>
 #include <asm/processor.h>
 #include <asm-generic/sections.h>
diff --git a/common/board_f.c b/common/board_f.c
index bafe3aa49c..f928c3dc73 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -18,6 +18,7 @@
 #include <fs.h>
 #include <i2c.h>
 #include <initcall.h>
+#include <init_helpers.h>
 #include <logbuff.h>
 #include <malloc.h>
 #include <mapmem.h>
@@ -46,9 +47,6 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <asm/sections.h>
-#if defined(CONFIG_X86) || defined(CONFIG_ARC)
-#include <asm/init_helpers.h>
-#endif
 #if defined(CONFIG_X86) || defined(CONFIG_ARC) || defined(CONFIG_XTENSA)
 #include <asm/relocate.h>
 #endif
diff --git a/common/board_r.c b/common/board_r.c
index c8eeb9cbd4..d69a33c4a3 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -27,6 +27,7 @@
 #include <ide.h>
 #endif
 #include <initcall.h>
+#include <init_helpers.h>
 #ifdef CONFIG_PS2KBD
 #include <keyboard.h>
 #endif
@@ -53,9 +54,6 @@
 #include <asm/mmu.h>
 #endif
 #include <asm/sections.h>
-#ifdef CONFIG_X86
-#include <asm/init_helpers.h>
-#endif
 #include <dm/root.h>
 #include <linux/compiler.h>
 #include <linux/err.h>
diff --git a/arch/x86/include/asm/init_helpers.h b/include/init_helpers.h
similarity index 56%
rename from arch/x86/include/asm/init_helpers.h
rename to include/init_helpers.h
index ef05ac4781..3efcfddb7b 100644
--- a/arch/x86/include/asm/init_helpers.h
+++ b/include/init_helpers.h
@@ -8,6 +8,11 @@
 #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_ */
+#endif	/* _INIT_HELPERS_H_ */
-- 
2.39.5