imx8: Replace PLAT_IMX8* with automatic PLAT_imx8*

Platform defines are already provided by the build system so let's not
duplicate them.

Change-Id: Icf1ea76c3c3213e27b447c95e2b22b961fa7693e
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

diff --git a/plat/imx/common/imx_sip_handler.c b/plat/imx/common/imx_sip_handler.c
index 89771cd6fad81591df5c02e33f8fad6c3db8b8c7..62048b696307353a604148ffccecfe941f229857 100644 (file)
--- a/plat/imx/common/imx_sip_handler.c
+++ b/plat/imx/common/imx_sip_handler.c
@@ -14,9 +14,9 @@
 #include <imx_sip_svc.h>
 #include <sci/sci.h>
 
-#if defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX)
+#if defined(PLAT_imx8qm) || defined(PLAT_imx8qx)
 
-#ifdef PLAT_IMX8QM
+#ifdef PLAT_imx8qm
 const static int ap_cluster_index[PLATFORM_CLUSTER_COUNT] = {
        SC_R_A53, SC_R_A72,
 };
@@ -56,10 +56,10 @@ static void imx_cpufreq_set_target(uint32_t cluster_id, unsigned long freq)
 {
        sc_pm_clock_rate_t rate = (sc_pm_clock_rate_t)freq;
 
-#ifdef PLAT_IMX8QM
+#ifdef PLAT_imx8qm
        sc_pm_set_clock_rate(ipc_handle, ap_cluster_index[cluster_id], SC_PM_CLK_CPU, &rate);
 #endif
-#ifdef PLAT_IMX8QX
+#ifdef PLAT_imx8qx
        sc_pm_set_clock_rate(ipc_handle, SC_R_A35, SC_PM_CLK_CPU, &rate);
 #endif
 }
@@ -141,7 +141,7 @@ int imx_misc_set_temp_handler(uint32_t smc_fid,
        return sc_misc_set_temp(ipc_handle, x1, x2, x3, x4);
 }
 
-#endif /* defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX) */
+#endif /* defined(PLAT_imx8qm) || defined(PLAT_imx8qx) */
 
 static uint64_t imx_get_commit_hash(u_register_t x2,
                    u_register_t x3,

diff --git a/plat/imx/common/imx_sip_svc.c b/plat/imx/common/imx_sip_svc.c
index 45d18eff0706cc96ab8d44d11b3419464f9994c5..4893b9fa53c7c25c36fa869db8fa6507e20c4dea 100644 (file)
--- a/plat/imx/common/imx_sip_svc.c
+++ b/plat/imx/common/imx_sip_svc.c
@@ -31,7 +31,7 @@ static uintptr_t imx_sip_handler(unsigned int smc_fid,
                SMC_RET1(handle, imx_soc_info_handler(smc_fid, x1, x2, x3));
                break;
 #endif
-#if (defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX))
+#if (defined(PLAT_imx8qm) || defined(PLAT_imx8qx))
        case  IMX_SIP_SRTC:
                return imx_srtc_handler(smc_fid, handle, x1, x2, x3, x4);
        case  IMX_SIP_CPUFREQ:

diff --git a/plat/imx/common/include/imx_sip_svc.h b/plat/imx/common/include/imx_sip_svc.h
index f532840d7351af002ac95949736d7ca4b5386981..5898f7a81ec5c375e76ba6c3e49b9e18a396aabf 100644 (file)
--- a/plat/imx/common/include/imx_sip_svc.h
+++ b/plat/imx/common/include/imx_sip_svc.h
@@ -33,7 +33,7 @@ int imx_soc_info_handler(uint32_t smc_fid, u_register_t x1,
                         u_register_t x2, u_register_t x3);
 #endif
 
-#if (defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX))
+#if (defined(PLAT_imx8qm) || defined(PLAT_imx8qx))
 int imx_cpufreq_handler(uint32_t smc_fid, u_register_t x1,
                        u_register_t x2, u_register_t x3);
 int imx_srtc_handler(uint32_t smc_fid, void *handle, u_register_t x1,

diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h
index 0e678ca84482e2c42d708356f01fbab7941b965b..959b820c52c1f05e91b41c863fac5d9de2b11f3b 100644 (file)
--- a/plat/imx/imx8m/imx8mq/include/platform_def.h
+++ b/plat/imx/imx8m/imx8mq/include/platform_def.h
@@ -122,7 +122,6 @@
 
 #define DEBUG_CONSOLE                  0
 #define IMX_WDOG_B_RESET
-#define PLAT_IMX8M                     1
 
 #define CAAM_JR0MID                    U(0x30900010)
 #define CAAM_JR1MID                    U(0x30900018)

diff --git a/plat/imx/imx8qm/include/platform_def.h b/plat/imx/imx8qm/include/platform_def.h
index 946be76592f78a5e1a101948ce039d78690e0235..138a4e1d30417aaf38ee5ac0c4ca615bc4d9e859 100644 (file)
--- a/plat/imx/imx8qm/include/platform_def.h
+++ b/plat/imx/imx8qm/include/platform_def.h
@@ -66,6 +66,5 @@
 
 #define DEBUG_CONSOLE                  0
 #define DEBUG_CONSOLE_A53              0
-#define PLAT_IMX8QM                    1
 
 #endif /* PLATFORM_DEF_H */

diff --git a/plat/imx/imx8qx/include/platform_def.h b/plat/imx/imx8qx/include/platform_def.h
index 3a3fac86f3025a72125d3cf7b1e9c98a962c15e9..108627f664292337c19029115adb1f769943802d 100644 (file)
--- a/plat/imx/imx8qx/include/platform_def.h
+++ b/plat/imx/imx8qx/include/platform_def.h
@@ -58,6 +58,5 @@
 
 #define DEBUG_CONSOLE                  0
 #define DEBUG_CONSOLE_A35              0
-#define PLAT_IMX8QX                    1
 
 #endif /* PLATFORM_DEF_H */