3 files changed, 1 insertions, 105 deletions
diff --git a/plat/freescale/imx8mq/include/fsl_sip.h b/plat/freescale/imx8mq/include/fsl_sip.h
deleted file mode 100644
index 73fa08d4..00000000
--- a/plat/freescale/imx8mq/include/fsl_sip.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017 NXP
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __SOC_FSL_SIP_H
-#define __SOC_FSL_SIP_H
-
-#define FSL_SIP_GPC			0xC2000000
-#define FSL_SIP_CONFIG_GPC_MASK		0x00
-#define FSL_SIP_CONFIG_GPC_UNMASK	0x01
-#define FSL_SIP_CONFIG_GPC_SET_WAKE	0x02
-#define FSL_SIP_CONFIG_GPC_PM_DOMAIN	0x03
-
-#endif
diff --git a/plat/freescale/imx8mq/platform.mk b/plat/freescale/imx8mq/platform.mk
index 424ccc83..b7c4b866 100644
--- a/plat/freescale/imx8mq/platform.mk
+++ b/plat/freescale/imx8mq/platform.mk
@@ -9,10 +9,10 @@ PLAT_GIC_SOURCES	:=	drivers/arm/gic/v3/gicv3_helpers.c	\
 
 BL31_SOURCES		+=	plat/freescale/common/imx8_helpers.S		\
 				plat/freescale/common/mxcuart_console.S		\
+				plat/freescale/common/sip_svc.c			\
 				plat/freescale/imx8mq/imx8m_bl31_setup.c	\
 				plat/freescale/imx8mq/gpc.c			\
 				plat/freescale/imx8mq/imx8m_psci.c		\
-				plat/freescale/imx8mq/sip_svc.c			\
 				plat/freescale/common/imx8_topology.c		\
 				plat/common/plat_psci_common.c			\
 				lib/xlat_tables/aarch64/xlat_tables.c		\
diff --git a/plat/freescale/imx8mq/sip_svc.c b/plat/freescale/imx8mq/sip_svc.c
deleted file mode 100644
index 0bf9cd3e..00000000
--- a/plat/freescale/imx8mq/sip_svc.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
- * Copyright 2017 NXP
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of ARM nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <debug.h>
-#include <fsl_sip.h>
-#include <runtime_svc.h>
-#include <smcc_helpers.h>
-#include <std_svc.h>
-#include <stdint.h>
-#include <uuid.h>
-
-extern int imx_gpc_handler(uint32_t  smc_fid, u_register_t x1, u_register_t x2, u_register_t x3);
-
-/* Setup i.MX platform specific services Services */
-static int32_t plat_svc_setup(void)
-{
-	/* gpc init ?*/
-	NOTICE("sip svc init\n");
-	return 0;
-}
-
-/* i.MX platform specific service SMC handler */
-uintptr_t imx_svc_smc_handler(uint32_t smc_fid,
-			      u_register_t x1,
-			      u_register_t x2,
-			      u_register_t x3, 
-			      u_register_t x4,
-			      void *cookie,
-			      void *handle,
-			      uint64_t flags)
-{
-	NOTICE("smc_fid is %x\n", smc_fid);
-	switch (smc_fid) {
-	case  FSL_SIP_GPC:
-		SMC_RET1(handle, imx_gpc_handler(smc_fid, x1, x2, x3));
-		break;
-	default:
-		WARN("Uimplemented SIP Service Call: 0x%x \n", smc_fid); 
-		SMC_RET1(handle, SMC_UNK);
-		break;
-	}
-}
-
-/* Rigister SIP Service Calls as runtime service */
-DECLARE_RT_SVC(
-		imx_svc,
-		OEN_SIP_START,
-		OEN_SIP_END,
-		SMC_TYPE_FAST,
-		plat_svc_setup,
-		imx_svc_smc_handler
-);