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>

diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 57ec2a9..3bc08e4 100644 (file)
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -25,7 +25,7 @@
 #define MXC_CPU_MX6QP          0x69
 #define MXC_CPU_MX7S           0x71 /* dummy ID */
 #define MXC_CPU_MX7D           0x72
-#define MXC_CPU_MX7ULP         0x81 /* Temporally hard code */
+#define MXC_CPU_MX7ULP         0xE1 /* dummy ID */
 #define MXC_CPU_IMX8MQ         0x82
 #define MXC_CPU_IMX8QM         0x91 /* dummy ID */
 #define MXC_CPU_IMX8QXP                0x92 /* dummy ID */
@@ -36,7 +36,7 @@
 #define MXC_SOC_MX7            0x70
 #define MXC_SOC_IMX8M          0x80
 #define MXC_SOC_IMX8           0x90 /* dummy */
-#define MXC_SOC_MX7ULP         0xA0 /* dummy */
+#define MXC_SOC_MX7ULP         0xE0 /* dummy */
 
 #define CHIP_REV_1_0            0x10
 #define CHIP_REV_1_1            0x11