imx-common: hab: support i.MX6DQPlus

Support i.MX6DQPlus, otherwise wrong hab address will be used
for i.MX6QDPlus.

Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Ulises Cardenas <Ulises.Cardenas@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>

diff --git a/arch/arm/imx-common/hab.c b/arch/arm/imx-common/hab.c
index a9806883385eb279863fe8280e2fc5c61dbeaa99..67318250607dd23604d2d799c4a4dff23764289b 100644 (file)
--- a/arch/arm/imx-common/hab.c
+++ b/arch/arm/imx-common/hab.c
@@ -17,6 +17,8 @@
 
 #define hab_rvt_report_event_p                                 \
 (                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
        (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
        ((hab_rvt_report_event_t *)HAB_RVT_REPORT_EVENT_NEW) :  \
        (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
@@ -26,6 +28,8 @@
 
 #define hab_rvt_report_status_p                                        \
 (                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
        (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
        ((hab_rvt_report_status_t *)HAB_RVT_REPORT_STATUS_NEW) :\
        (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
@@ -35,6 +39,8 @@
 
 #define hab_rvt_authenticate_image_p                           \
 (                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
        (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
        ((hab_rvt_authenticate_image_t *)HAB_RVT_AUTHENTICATE_IMAGE_NEW) : \
        (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
@@ -44,6 +50,8 @@
 
 #define hab_rvt_entry_p                                                \
 (                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
        (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
        ((hab_rvt_entry_t *)HAB_RVT_ENTRY_NEW) :                \
        (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \
@@ -53,6 +61,8 @@
 
 #define hab_rvt_exit_p                                         \
 (                                                              \
+       (is_mx6dqp()) ?                                         \
+       ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
        (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ?           \
        ((hab_rvt_exit_t *)HAB_RVT_EXIT_NEW) :                  \
        (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ?          \