Commit f56afc1f authored by Leonard Crestez's avatar Leonard Crestez
Browse files

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: default avatarLeonard Crestez <leonard.crestez@nxp.com>
Showing with 7 additions and 10 deletions
+7 -10
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <imx_sip_svc.h> #include <imx_sip_svc.h>
#include <sci/sci.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] = { const static int ap_cluster_index[PLATFORM_CLUSTER_COUNT] = {
SC_R_A53, SC_R_A72, SC_R_A53, SC_R_A72,
}; };
...@@ -56,10 +56,10 @@ static void imx_cpufreq_set_target(uint32_t cluster_id, unsigned long freq) ...@@ -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; 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); sc_pm_set_clock_rate(ipc_handle, ap_cluster_index[cluster_id], SC_PM_CLK_CPU, &rate);
#endif #endif
#ifdef PLAT_IMX8QX #ifdef PLAT_imx8qx
sc_pm_set_clock_rate(ipc_handle, SC_R_A35, SC_PM_CLK_CPU, &rate); sc_pm_set_clock_rate(ipc_handle, SC_R_A35, SC_PM_CLK_CPU, &rate);
#endif #endif
} }
...@@ -141,7 +141,7 @@ int imx_misc_set_temp_handler(uint32_t smc_fid, ...@@ -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); 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, static uint64_t imx_get_commit_hash(u_register_t x2,
u_register_t x3, u_register_t x3,
......
...@@ -31,7 +31,7 @@ static uintptr_t imx_sip_handler(unsigned int smc_fid, ...@@ -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)); SMC_RET1(handle, imx_soc_info_handler(smc_fid, x1, x2, x3));
break; break;
#endif #endif
#if (defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX)) #if (defined(PLAT_imx8qm) || defined(PLAT_imx8qx))
case IMX_SIP_SRTC: case IMX_SIP_SRTC:
return imx_srtc_handler(smc_fid, handle, x1, x2, x3, x4); return imx_srtc_handler(smc_fid, handle, x1, x2, x3, x4);
case IMX_SIP_CPUFREQ: case IMX_SIP_CPUFREQ:
......
...@@ -33,7 +33,7 @@ int imx_soc_info_handler(uint32_t smc_fid, u_register_t x1, ...@@ -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); u_register_t x2, u_register_t x3);
#endif #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, int imx_cpufreq_handler(uint32_t smc_fid, u_register_t x1,
u_register_t x2, u_register_t x3); u_register_t x2, u_register_t x3);
int imx_srtc_handler(uint32_t smc_fid, void *handle, u_register_t x1, int imx_srtc_handler(uint32_t smc_fid, void *handle, u_register_t x1,
......
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
#define DEBUG_CONSOLE 0 #define DEBUG_CONSOLE 0
#define IMX_WDOG_B_RESET #define IMX_WDOG_B_RESET
#define PLAT_IMX8M 1
#define CAAM_JR0MID U(0x30900010) #define CAAM_JR0MID U(0x30900010)
#define CAAM_JR1MID U(0x30900018) #define CAAM_JR1MID U(0x30900018)
......
...@@ -66,6 +66,5 @@ ...@@ -66,6 +66,5 @@
#define DEBUG_CONSOLE 0 #define DEBUG_CONSOLE 0
#define DEBUG_CONSOLE_A53 0 #define DEBUG_CONSOLE_A53 0
#define PLAT_IMX8QM 1
#endif /* PLATFORM_DEF_H */ #endif /* PLATFORM_DEF_H */
...@@ -58,6 +58,5 @@ ...@@ -58,6 +58,5 @@
#define DEBUG_CONSOLE 0 #define DEBUG_CONSOLE 0
#define DEBUG_CONSOLE_A35 0 #define DEBUG_CONSOLE_A35 0
#define PLAT_IMX8QX 1
#endif /* PLATFORM_DEF_H */ #endif /* PLATFORM_DEF_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment