summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/arch-mx31/sys_proto.h
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-08-13 10:55:34 +0800
committerStefano Babic <sbabic@denx.de>2015-09-02 15:29:14 +0200
commitfc684e87a1d1342cecbaf68ad8690482e4baff76 (patch)
treeb7d010c037c42275411c6813a26826961f6c76cc /arch/arm/include/asm/arch-mx31/sys_proto.h
parentbf3b9cb6e8088955c4271f1af03596cc2df26cd8 (diff)
downloadu-boot-imx-fc684e87a1d1342cecbaf68ad8690482e4baff76.zip
u-boot-imx-fc684e87a1d1342cecbaf68ad8690482e4baff76.tar.gz
u-boot-imx-fc684e87a1d1342cecbaf68ad8690482e4baff76.tar.bz2
imx-common: consolidate macros and prototypes into sys_proto.h
Move most macro definitions and prototypes into "arch/arm/include/asm/imx-common/sys_proto.h" to avoid duplicated function prototypes and marco definitions for different i.MX SoCs. This patch do not remove the sys_proto.h for different i.MX SoCs, because we need to modify lots of driver code and others. This patch remove duplicated macros and prototypes and incude "sys_proto.h" of imx-common for each sys_proto.h of different i.MX platforms. Then later we should avoid add stuff in sys_proto.h of each platform, and modify driver to include common sys_proto.h. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/include/asm/arch-mx31/sys_proto.h')
-rw-r--r--arch/arm/include/asm/arch-mx31/sys_proto.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
index 1626442..674b25c 100644
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -5,10 +5,10 @@
* SPDX-License-Identifier: GPL-2.0+
*/
-#ifndef _SYS_PROTO_H_
-#define _SYS_PROTO_H_
+#ifndef _MX31_SYS_PROTO_H_
+#define _MX31_SYS_PROTO_H_
-#include "../arch-imx/cpu.h"
+#include <asm/imx-common/sys_proto.h>
struct mxc_weimcs {
u32 upper;
@@ -18,5 +18,4 @@ struct mxc_weimcs {
void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs);
int mxc_mmc_init(bd_t *bis);
-u32 get_cpu_rev(void);
#endif