summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-08-13 10:55:32 +0800
committerStefano Babic <sbabic@denx.de>2015-09-02 15:29:14 +0200
commit2af896abf60ed93c57d72d62635daef8ca6124c2 (patch)
treeb4b7804f160a0d9b3a6ed9c28a09fd724fd853da /arch/arm
parent49ea15d55fcbb3ee26a23cbfbda314bc17467ad8 (diff)
downloadu-boot-imx-2af896abf60ed93c57d72d62635daef8ca6124c2.zip
u-boot-imx-2af896abf60ed93c57d72d62635daef8ca6124c2.tar.gz
u-boot-imx-2af896abf60ed93c57d72d62635daef8ca6124c2.tar.bz2
imx: mx31 use new formula for get_cpu_rev
Use new formula for get_cpu_rev, since we need to use this formula to do runtime check for all i.MXes. 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')
-rw-r--r--arch/arm/cpu/arm1136/mx31/generic.c2
-rw-r--r--arch/arm/include/asm/arch-mx31/sys_proto.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index 060d46b..fe96670 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -175,7 +175,7 @@ u32 get_cpu_rev(void)
for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++)
if (srev == mx31_cpu_type[i].srev)
- return mx31_cpu_type[i].v;
+ return mx31_cpu_type[i].v | (MXC_CPU_MX31 << 12);
return srev | 0x8000;
}
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
index b0dfcba..1626442 100644
--- a/arch/arm/include/asm/arch-mx31/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -8,6 +8,8 @@
#ifndef _SYS_PROTO_H_
#define _SYS_PROTO_H_
+#include "../arch-imx/cpu.h"
+
struct mxc_weimcs {
u32 upper;
u32 lower;