Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3c79e2d9a714f0fb0784890b174582174633f1d2

Authored by Peng Fan
Committed by Ye Li
1 parent f611192409
Exists in smarc-imx_v2017.03_o8.1.0_1.3.0_8m and in 1 other branch smarc-imx_v2017.03_4.9.88_2.0.0_ga

MLK-17896: imx: imx7ulp: Update i.MX7ULP SoC and CPU ID 

Currently is not possible to call HAB API on i.MX7ULP:

=> hab_status

Secure boot disabled

System is hanging here.

The function is_mx8m() is returning true for i.MX7ULP, thus calling
HAB API with a wrong HAB RVT address.

Align SoC ID and CPU ID with U-Boot upstream to address this issue:
http://git.denx.de/?p=u-boot.git;a=commit;h=4fdffb98568651f6581bccb53f5277cb0d2dcdc5

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/arm/include/asm/arch-imx/cpu.h
Diff comments   View file @ 3c79e2d
... ... @@ -25,7 +25,7 @@
25 25 #define MXC_CPU_MX6QP 0x69
26 26 #define MXC_CPU_MX7S 0x71 /* dummy ID */
27 27 #define MXC_CPU_MX7D 0x72
28   -#define MXC_CPU_MX7ULP 0x81 /* Temporally hard code */
  28 +#define MXC_CPU_MX7ULP 0xE1 /* dummy ID */
29 29 #define MXC_CPU_IMX8MQ 0x82
30 30 #define MXC_CPU_IMX8QM 0x91 /* dummy ID */
31 31 #define MXC_CPU_IMX8QXP 0x92 /* dummy ID */
... ... @@ -36,7 +36,7 @@
36 36 #define MXC_SOC_MX7 0x70
37 37 #define MXC_SOC_IMX8M 0x80
38 38 #define MXC_SOC_IMX8 0x90 /* dummy */
39   -#define MXC_SOC_MX7ULP 0xA0 /* dummy */
  39 +#define MXC_SOC_MX7ULP 0xE0 /* dummy */
40 40  
41 41 #define CHIP_REV_1_0 0x10
42 42 #define CHIP_REV_1_1 0x11