summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-04-12 11:14:40 +0800
committerPeng Fan <peng.fan@nxp.com>2016-04-13 10:22:32 +0800
commit936de37e4ce31525a21beacd4215990e473a7417 (patch)
treed63ecb46fa14fecd435e9b805a705d4e4e4c0e5a /arch
parent4a798a4c4686578a60ad74de34e39de947d85c4a (diff)
downloadu-boot-imx-936de37e4ce31525a21beacd4215990e473a7417.zip
u-boot-imx-936de37e4ce31525a21beacd4215990e473a7417.tar.gz
u-boot-imx-936de37e4ce31525a21beacd4215990e473a7417.tar.bz2
MLK-12616-2 mx6ull: add MX6ULL major CPU Type
Add MXC_CPU_MX6ULL for i.MX6ULL CPU ID Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 7377004dfc8d5d01f6ca7899f6355a0ac4ea7f8a)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/imx-common/cpu.c2
-rw-r--r--arch/arm/include/asm/arch-imx/cpu.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c
index d3f19d7..a8a015d 100644
--- a/arch/arm/imx-common/cpu.c
+++ b/arch/arm/imx-common/cpu.c
@@ -161,6 +161,8 @@ const char *get_imx_type(u32 imxtype)
return "6SX"; /* SoloX version of the mx6 */
case MXC_CPU_MX6UL:
return "6UL"; /* Ultra-Lite version of the mx6 */
+ case MXC_CPU_MX6ULL:
+ return "6ULL"; /* ULL version of the mx6 */
case MXC_CPU_MX51:
return "51";
case MXC_CPU_MX53:
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 8a75902..c0f6c0e 100644
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2014 Freescale Semiconductor, Inc.
+ * (C) Copyright 2014-2016 Freescale Semiconductor, Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -17,7 +17,8 @@
#define MXC_CPU_MX6SX 0x62
#define MXC_CPU_MX6Q 0x63
#define MXC_CPU_MX6UL 0x64
-#define MXC_CPU_MX6SOLO 0x65 /* dummy ID */
+#define MXC_CPU_MX6ULL 0x65
+#define MXC_CPU_MX6SOLO 0x66 /* dummy */
#define MXC_CPU_MX6D 0x67
#define MXC_CPU_MX6DP 0x68
#define MXC_CPU_MX6QP 0x69