diff --git a/drivers/amlogic/gxl/crypto/sha_dma.c b/drivers/amlogic/crypto/sha_dma.c
similarity index 100%
rename from drivers/amlogic/gxl/crypto/sha_dma.c
rename to drivers/amlogic/crypto/sha_dma.c
index a969dea74c50bff8a13f3fad600f3f1c85a8f8f1..d48ded987a647661623744d310371e4b4ce04e95 100644
--- a/drivers/amlogic/gxl/crypto/sha_dma.c
+++ b/drivers/amlogic/crypto/sha_dma.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <assert.h>
 #include <arch_helpers.h>
-#include <lib/mmio.h>
+#include <assert.h>
 #include <crypto/sha_dma.h>
+#include <lib/mmio.h>
 
 #define AML_SHA_DMA_BASE 0xc883e000
 
diff --git a/include/drivers/amlogic/gxl/crypto/sha_dma.h b/include/drivers/amlogic/crypto/sha_dma.h
similarity index 100%
rename from include/drivers/amlogic/gxl/crypto/sha_dma.h
rename to include/drivers/amlogic/crypto/sha_dma.h
diff --git a/plat/amlogic/gxl/platform.mk b/plat/amlogic/gxl/platform.mk
index f699381d54db3019780884ffa104d07881820f62..a7cda770806d4cc92f42f421361fbb6d4dbe21ca 100644
--- a/plat/amlogic/gxl/platform.mk
+++ b/plat/amlogic/gxl/platform.mk
@@ -14,7 +14,6 @@ DOIMAGEPATH		?=	tools/amlogic
 DOIMAGETOOL		?=	${DOIMAGEPATH}/doimage
 
 PLAT_INCLUDES		:=	-Iinclude/drivers/amlogic/		\
-				-Iinclude/drivers/amlogic/${PLAT}	\
 				-I${AML_PLAT_SOC}/include
 
 GIC_SOURCES		:=	drivers/arm/gic/common/gic_common.c	\
@@ -37,7 +36,7 @@ BL31_SOURCES		+=	lib/cpus/aarch64/cortex_a53.S		\
 				${AML_PLAT_SOC}/gxl_scpi.c		\
 				${AML_PLAT_SOC}/gxl_sip_svc.c		\
 				${AML_PLAT_SOC}/gxl_thermal.c		\
-				drivers/amlogic/${PLAT}/crypto/sha_dma.c	\
+				drivers/amlogic/crypto/sha_dma.c	\
 				${GIC_SOURCES}
 
 # Tune compiler for Cortex-A53