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: 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/include/asm/init_helpers.h | 13 -------------
 arch/x86/lib/spl.c                  |  2 +-
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 arch/arc/include/asm/init_helpers.h
 delete mode 100644 arch/x86/include/asm/init_helpers.h

(limited to 'arch')

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/include/asm/init_helpers.h b/arch/x86/include/asm/init_helpers.h
deleted file mode 100644
index ef05ac4781..0000000000
--- a/arch/x86/include/asm/init_helpers.h
+++ /dev/null
@@ -1,13 +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_
-
-int init_cache_f_r(void);
-
-#endif	/* !_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>
-- 
cgit v1.2.3