Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 936de37e4ce31525a21beacd4215990e473a7417

Authored by Ye Li
Committed by Peng Fan
1 parent 4a798a4c46
Exists in smarc-rel_imx_4.1.15_2.0.0_ga

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)

Showing 2 changed files with 5 additions and 2 deletions Side-by-side Diff

arch/arm/imx-common/cpu.c
Diff comments   View file @ 936de37
... ... @@ -161,6 +161,8 @@
161 161 return "6SX"; /* SoloX version of the mx6 */
162 162 case MXC_CPU_MX6UL:
163 163 return "6UL"; /* Ultra-Lite version of the mx6 */
  164 + case MXC_CPU_MX6ULL:
  165 + return "6ULL"; /* ULL version of the mx6 */
164 166 case MXC_CPU_MX51:
165 167 return "51";
166 168 case MXC_CPU_MX53:
arch/arm/include/asm/arch-imx/cpu.h
Diff comments   View file @ 936de37
1 1 /*
2   - * (C) Copyright 2014 Freescale Semiconductor, Inc.
  2 + * (C) Copyright 2014-2016 Freescale Semiconductor, Inc.
3 3 *
4 4 * SPDX-License-Identifier: GPL-2.0+
5 5 */
... ... @@ -17,7 +17,8 @@
17 17 #define MXC_CPU_MX6SX 0x62
18 18 #define MXC_CPU_MX6Q 0x63
19 19 #define MXC_CPU_MX6UL 0x64
20   -#define MXC_CPU_MX6SOLO 0x65 /* dummy ID */
  20 +#define MXC_CPU_MX6ULL 0x65
  21 +#define MXC_CPU_MX6SOLO 0x66 /* dummy */
21 22 #define MXC_CPU_MX6D 0x67
22 23 #define MXC_CPU_MX6DP 0x68
23 24 #define MXC_CPU_MX6QP 0x69