From 3374752fc15f173bb059cd8732e2119989c1504c Mon Sep 17 00:00:00 2001 From: Bo-Chen Chen Date: Mon, 5 Sep 2022 11:18:04 +0800 Subject: [PATCH] refator(mediatek): move drivers folder in common to plat/mediatek We plan to put some soc related drivers in common/drivers. To reduce confision, we move them to plat/mediatek. Signed-off-by: Bo-Chen Chen Change-Id: I6b344e660f40a23b15151aab073d3045b28f52aa --- .../{common => }/drivers/gic600/mt_gic_v3.c | 2 +- .../{common => }/drivers/gic600/mt_gic_v3.h | 2 +- .../{common => }/drivers/gpio/mtgpio_common.c | 2 +- .../{common => }/drivers/gpio/mtgpio_common.h | 2 +- .../{common => drivers}/lpm/mt_lp_rm.c | 2 +- .../{common => drivers}/lpm/mt_lp_rm.h | 2 +- .../drivers/pmic_wrap/pmic_wrap_init.c | 2 +- .../drivers/pmic_wrap/pmic_wrap_init_v2.c | 2 +- .../{common => }/drivers/rtc/rtc_common.c | 2 +- .../{common => }/drivers/rtc/rtc_mt6359p.c | 2 +- .../{common => }/drivers/rtc/rtc_mt6359p.h | 2 +- .../{common => }/drivers/timer/mt_timer.c | 2 +- .../{common => }/drivers/timer/mt_timer.h | 2 +- .../{common => }/drivers/uart/8250_console.S | 2 +- .../mediatek/{common => }/drivers/uart/uart.c | 2 +- .../mediatek/{common => }/drivers/uart/uart.h | 2 +- .../{common => }/drivers/uart/uart8250.h | 2 +- plat/mediatek/mt8173/platform.mk | 4 +-- plat/mediatek/mt8183/platform.mk | 8 ++--- plat/mediatek/mt8186/platform.mk | 30 ++++++++-------- plat/mediatek/mt8192/platform.mk | 28 +++++++-------- plat/mediatek/mt8195/platform.mk | 34 +++++++++---------- 22 files changed, 69 insertions(+), 69 deletions(-) rename plat/mediatek/{common => }/drivers/gic600/mt_gic_v3.c (98%) rename plat/mediatek/{common => }/drivers/gic600/mt_gic_v3.h (90%) rename plat/mediatek/{common => }/drivers/gpio/mtgpio_common.c (99%) rename plat/mediatek/{common => }/drivers/gpio/mtgpio_common.h (97%) rename plat/mediatek/{common => drivers}/lpm/mt_lp_rm.c (97%) rename plat/mediatek/{common => drivers}/lpm/mt_lp_rm.h (94%) rename plat/mediatek/{common => }/drivers/pmic_wrap/pmic_wrap_init.c (98%) rename plat/mediatek/{common => }/drivers/pmic_wrap/pmic_wrap_init_v2.c (98%) rename plat/mediatek/{common => }/drivers/rtc/rtc_common.c (94%) rename plat/mediatek/{common => }/drivers/rtc/rtc_mt6359p.c (97%) rename plat/mediatek/{common => }/drivers/rtc/rtc_mt6359p.h (98%) rename plat/mediatek/{common => }/drivers/timer/mt_timer.c (91%) rename plat/mediatek/{common => }/drivers/timer/mt_timer.h (94%) rename plat/mediatek/{common => }/drivers/uart/8250_console.S (98%) rename plat/mediatek/{common => }/drivers/uart/uart.c (98%) rename plat/mediatek/{common => }/drivers/uart/uart.h (98%) rename plat/mediatek/{common => }/drivers/uart/uart8250.h (93%) diff --git a/plat/mediatek/common/drivers/gic600/mt_gic_v3.c b/plat/mediatek/drivers/gic600/mt_gic_v3.c similarity index 98% rename from plat/mediatek/common/drivers/gic600/mt_gic_v3.c rename to plat/mediatek/drivers/gic600/mt_gic_v3.c index ae8d697a5..7652c4f0b 100644 --- a/plat/mediatek/common/drivers/gic600/mt_gic_v3.c +++ b/plat/mediatek/drivers/gic600/mt_gic_v3.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/gic600/mt_gic_v3.h b/plat/mediatek/drivers/gic600/mt_gic_v3.h similarity index 90% rename from plat/mediatek/common/drivers/gic600/mt_gic_v3.h rename to plat/mediatek/drivers/gic600/mt_gic_v3.h index c4ab44fa3..98835f0f5 100644 --- a/plat/mediatek/common/drivers/gic600/mt_gic_v3.h +++ b/plat/mediatek/drivers/gic600/mt_gic_v3.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/gpio/mtgpio_common.c b/plat/mediatek/drivers/gpio/mtgpio_common.c similarity index 99% rename from plat/mediatek/common/drivers/gpio/mtgpio_common.c rename to plat/mediatek/drivers/gpio/mtgpio_common.c index 89977a550..90e540027 100644 --- a/plat/mediatek/common/drivers/gpio/mtgpio_common.c +++ b/plat/mediatek/drivers/gpio/mtgpio_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/gpio/mtgpio_common.h b/plat/mediatek/drivers/gpio/mtgpio_common.h similarity index 97% rename from plat/mediatek/common/drivers/gpio/mtgpio_common.h rename to plat/mediatek/drivers/gpio/mtgpio_common.h index bf5105571..68d96e533 100644 --- a/plat/mediatek/common/drivers/gpio/mtgpio_common.h +++ b/plat/mediatek/drivers/gpio/mtgpio_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/lpm/mt_lp_rm.c b/plat/mediatek/drivers/lpm/mt_lp_rm.c similarity index 97% rename from plat/mediatek/common/lpm/mt_lp_rm.c rename to plat/mediatek/drivers/lpm/mt_lp_rm.c index f3148fe74..0bafc661b 100644 --- a/plat/mediatek/common/lpm/mt_lp_rm.c +++ b/plat/mediatek/drivers/lpm/mt_lp_rm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/lpm/mt_lp_rm.h b/plat/mediatek/drivers/lpm/mt_lp_rm.h similarity index 94% rename from plat/mediatek/common/lpm/mt_lp_rm.h rename to plat/mediatek/drivers/lpm/mt_lp_rm.h index 39759f1d2..e93dac3d7 100644 --- a/plat/mediatek/common/lpm/mt_lp_rm.h +++ b/plat/mediatek/drivers/lpm/mt_lp_rm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/pmic_wrap/pmic_wrap_init.c b/plat/mediatek/drivers/pmic_wrap/pmic_wrap_init.c similarity index 98% rename from plat/mediatek/common/drivers/pmic_wrap/pmic_wrap_init.c rename to plat/mediatek/drivers/pmic_wrap/pmic_wrap_init.c index e3cfd46a0..0ee1c6498 100644 --- a/plat/mediatek/common/drivers/pmic_wrap/pmic_wrap_init.c +++ b/plat/mediatek/drivers/pmic_wrap/pmic_wrap_init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, MediaTek Inc. All rights reserved. + * Copyright (c) 2019-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/pmic_wrap/pmic_wrap_init_v2.c b/plat/mediatek/drivers/pmic_wrap/pmic_wrap_init_v2.c similarity index 98% rename from plat/mediatek/common/drivers/pmic_wrap/pmic_wrap_init_v2.c rename to plat/mediatek/drivers/pmic_wrap/pmic_wrap_init_v2.c index d9a79c494..80f55de48 100644 --- a/plat/mediatek/common/drivers/pmic_wrap/pmic_wrap_init_v2.c +++ b/plat/mediatek/drivers/pmic_wrap/pmic_wrap_init_v2.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/rtc/rtc_common.c b/plat/mediatek/drivers/rtc/rtc_common.c similarity index 94% rename from plat/mediatek/common/drivers/rtc/rtc_common.c rename to plat/mediatek/drivers/rtc/rtc_common.c index cad12a03b..4efddffb4 100644 --- a/plat/mediatek/common/drivers/rtc/rtc_common.c +++ b/plat/mediatek/drivers/rtc/rtc_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, MediaTek Inc. All rights reserved. + * Copyright (c) 2019-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/rtc/rtc_mt6359p.c b/plat/mediatek/drivers/rtc/rtc_mt6359p.c similarity index 97% rename from plat/mediatek/common/drivers/rtc/rtc_mt6359p.c rename to plat/mediatek/drivers/rtc/rtc_mt6359p.c index 124bc8fbe..3bf433793 100644 --- a/plat/mediatek/common/drivers/rtc/rtc_mt6359p.c +++ b/plat/mediatek/drivers/rtc/rtc_mt6359p.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/rtc/rtc_mt6359p.h b/plat/mediatek/drivers/rtc/rtc_mt6359p.h similarity index 98% rename from plat/mediatek/common/drivers/rtc/rtc_mt6359p.h rename to plat/mediatek/drivers/rtc/rtc_mt6359p.h index 04726e390..199f1522e 100644 --- a/plat/mediatek/common/drivers/rtc/rtc_mt6359p.h +++ b/plat/mediatek/drivers/rtc/rtc_mt6359p.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/timer/mt_timer.c b/plat/mediatek/drivers/timer/mt_timer.c similarity index 91% rename from plat/mediatek/common/drivers/timer/mt_timer.c rename to plat/mediatek/drivers/timer/mt_timer.c index 08608854a..ca4528a09 100644 --- a/plat/mediatek/common/drivers/timer/mt_timer.c +++ b/plat/mediatek/drivers/timer/mt_timer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/timer/mt_timer.h b/plat/mediatek/drivers/timer/mt_timer.h similarity index 94% rename from plat/mediatek/common/drivers/timer/mt_timer.h rename to plat/mediatek/drivers/timer/mt_timer.h index b35317715..71dbeff13 100644 --- a/plat/mediatek/common/drivers/timer/mt_timer.h +++ b/plat/mediatek/drivers/timer/mt_timer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/uart/8250_console.S b/plat/mediatek/drivers/uart/8250_console.S similarity index 98% rename from plat/mediatek/common/drivers/uart/8250_console.S rename to plat/mediatek/drivers/uart/8250_console.S index 7a946f9a3..66f998d40 100644 --- a/plat/mediatek/common/drivers/uart/8250_console.S +++ b/plat/mediatek/drivers/uart/8250_console.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/uart/uart.c b/plat/mediatek/drivers/uart/uart.c similarity index 98% rename from plat/mediatek/common/drivers/uart/uart.c rename to plat/mediatek/drivers/uart/uart.c index b940eb339..fdaa793ba 100644 --- a/plat/mediatek/common/drivers/uart/uart.c +++ b/plat/mediatek/drivers/uart/uart.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/uart/uart.h b/plat/mediatek/drivers/uart/uart.h similarity index 98% rename from plat/mediatek/common/drivers/uart/uart.h rename to plat/mediatek/drivers/uart/uart.h index ac8b94dd1..2ca74fa3f 100644 --- a/plat/mediatek/common/drivers/uart/uart.h +++ b/plat/mediatek/drivers/uart/uart.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, MediaTek Inc. All rights reserved. + * Copyright (c) 2020-2022, MediaTek Inc. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/common/drivers/uart/uart8250.h b/plat/mediatek/drivers/uart/uart8250.h similarity index 93% rename from plat/mediatek/common/drivers/uart/uart8250.h rename to plat/mediatek/drivers/uart/uart8250.h index da7c7a125..f0541d608 100644 --- a/plat/mediatek/common/drivers/uart/uart8250.h +++ b/plat/mediatek/drivers/uart/uart8250.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2022, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ diff --git a/plat/mediatek/mt8173/platform.mk b/plat/mediatek/mt8173/platform.mk index fa3605abe..6bf1aa735 100644 --- a/plat/mediatek/mt8173/platform.mk +++ b/plat/mediatek/mt8173/platform.mk @@ -37,10 +37,10 @@ BL31_SOURCES += common/desc_image_load.c \ lib/cpus/aarch64/cortex_a53.S \ lib/cpus/aarch64/cortex_a57.S \ lib/cpus/aarch64/cortex_a72.S \ - ${MTK_PLAT}/common/drivers/pmic_wrap/pmic_wrap_init.c \ - ${MTK_PLAT}/common/drivers/rtc/rtc_common.c \ ${MTK_PLAT}/common/mtk_plat_common.c \ ${MTK_PLAT}/common/mtk_sip_svc.c \ + ${MTK_PLAT}/drivers/pmic_wrap/pmic_wrap_init.c \ + ${MTK_PLAT}/drivers/rtc/rtc_common.c \ ${MTK_PLAT_SOC}/aarch64/plat_helpers.S \ ${MTK_PLAT_SOC}/aarch64/platform_common.c \ ${MTK_PLAT_SOC}/bl31_plat_setup.c \ diff --git a/plat/mediatek/mt8183/platform.mk b/plat/mediatek/mt8183/platform.mk index 653a0a69b..a737d24b8 100644 --- a/plat/mediatek/mt8183/platform.mk +++ b/plat/mediatek/mt8183/platform.mk @@ -8,7 +8,7 @@ MTK_PLAT := plat/mediatek MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ - -I${MTK_PLAT}/common/drivers/uart/ \ + -I${MTK_PLAT}/drivers/uart/ \ -I${MTK_PLAT}/include/ \ -I${MTK_PLAT_SOC}/drivers/ \ -I${MTK_PLAT_SOC}/drivers/emi_mpu/ \ @@ -44,10 +44,10 @@ BL31_SOURCES += common/desc_image_load.c \ lib/cpus/aarch64/cortex_a73.S \ plat/common/plat_gicv3.c \ ${MTK_PLAT}/common/mtk_plat_common.c \ - ${MTK_PLAT}/common/drivers/pmic_wrap/pmic_wrap_init.c \ - ${MTK_PLAT}/common/drivers/rtc/rtc_common.c \ - ${MTK_PLAT}/common/drivers/uart/uart.c \ ${MTK_PLAT}/common/params_setup.c \ + ${MTK_PLAT}/drivers/pmic_wrap/pmic_wrap_init.c \ + ${MTK_PLAT}/drivers/rtc/rtc_common.c \ + ${MTK_PLAT}/drivers/uart/uart.c \ ${MTK_PLAT_SOC}/aarch64/plat_helpers.S \ ${MTK_PLAT_SOC}/aarch64/platform_common.c \ ${MTK_PLAT_SOC}/drivers/devapc/devapc.c \ diff --git a/plat/mediatek/mt8186/platform.mk b/plat/mediatek/mt8186/platform.mk index 149203895..2d61403b8 100644 --- a/plat/mediatek/mt8186/platform.mk +++ b/plat/mediatek/mt8186/platform.mk @@ -8,17 +8,17 @@ MTK_PLAT := plat/mediatek MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ - -I${MTK_PLAT}/common/drivers/gic600/ \ - -I${MTK_PLAT}/common/drivers/gpio/ \ - -I${MTK_PLAT}/common/drivers/uart/ \ - -I${MTK_PLAT}/common/drivers/timer/ \ - -I${MTK_PLAT}/common/lpm/ \ + -I${MTK_PLAT}/drivers/gic600/ \ + -I${MTK_PLAT}/drivers/gpio/ \ + -I${MTK_PLAT}/drivers/lpm/ \ + -I${MTK_PLAT}/drivers/timer/ \ + -I${MTK_PLAT}/drivers/uart/ \ -I${MTK_PLAT}/include/ \ -I${MTK_PLAT_SOC}/drivers/spm/ \ -I${MTK_PLAT_SOC}/drivers/dcm/ \ - -I${MTK_PLAT_SOC}/drivers/dfd/ \ + -I${MTK_PLAT_SOC}/drivers/dfd/ \ -I${MTK_PLAT_SOC}/drivers/emi_mpu/ \ - -I${MTK_PLAT_SOC}/drivers/gpio/ \ + -I${MTK_PLAT_SOC}/drivers/gpio/ \ -I${MTK_PLAT_SOC}/drivers/mcdi/ \ -I${MTK_PLAT_SOC}/drivers/pmic/ \ -I${MTK_PLAT_SOC}/drivers/rtc/ \ @@ -44,17 +44,17 @@ BL31_SOURCES += common/desc_image_load.c \ lib/cpus/aarch64/cortex_a55.S \ lib/cpus/aarch64/cortex_a76.S \ plat/common/plat_gicv3.c \ - ${MTK_PLAT}/common/drivers/gic600/mt_gic_v3.c \ - ${MTK_PLAT}/common/drivers/gpio/mtgpio_common.c \ - ${MTK_PLAT}/common/drivers/pmic_wrap/pmic_wrap_init.c \ - ${MTK_PLAT}/common/drivers/rtc/rtc_common.c \ ${MTK_PLAT}/common/mtk_plat_common.c \ ${MTK_PLAT}/common/mtk_sip_svc.c \ ${MTK_PLAT}/common/params_setup.c \ - ${MTK_PLAT}/common/drivers/timer/mt_timer.c \ - ${MTK_PLAT}/common/drivers/uart/uart.c \ - ${MTK_PLAT}/common/mtk_cirq.c \ - ${MTK_PLAT}/common/lpm/mt_lp_rm.c \ + ${MTK_PLAT}/common/mtk_cirq.c \ + ${MTK_PLAT}/drivers/gic600/mt_gic_v3.c \ + ${MTK_PLAT}/drivers/gpio/mtgpio_common.c \ + ${MTK_PLAT}/drivers/lpm/mt_lp_rm.c \ + ${MTK_PLAT}/drivers/pmic_wrap/pmic_wrap_init.c \ + ${MTK_PLAT}/drivers/rtc/rtc_common.c \ + ${MTK_PLAT}/drivers/timer/mt_timer.c \ + ${MTK_PLAT}/drivers/uart/uart.c \ ${MTK_PLAT_SOC}/aarch64/platform_common.c \ ${MTK_PLAT_SOC}/aarch64/plat_helpers.S \ ${MTK_PLAT_SOC}/bl31_plat_setup.c \ diff --git a/plat/mediatek/mt8192/platform.mk b/plat/mediatek/mt8192/platform.mk index 4f61368bf..643477b9a 100644 --- a/plat/mediatek/mt8192/platform.mk +++ b/plat/mediatek/mt8192/platform.mk @@ -8,12 +8,12 @@ MTK_PLAT := plat/mediatek MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ - -I${MTK_PLAT}/common/drivers/gic600/ \ - -I${MTK_PLAT}/common/drivers/gpio/ \ - -I${MTK_PLAT}/common/drivers/rtc/ \ - -I${MTK_PLAT}/common/drivers/timer/ \ - -I${MTK_PLAT}/common/drivers/uart/ \ - -I${MTK_PLAT}/common/lpm/ \ + -I${MTK_PLAT}/drivers/gic600/ \ + -I${MTK_PLAT}/drivers/gpio/ \ + -I${MTK_PLAT}/drivers/lpm/ \ + -I${MTK_PLAT}/drivers/rtc/ \ + -I${MTK_PLAT}/drivers/timer/ \ + -I${MTK_PLAT}/drivers/uart/ \ -I${MTK_PLAT}/include/ \ -I${MTK_PLAT_SOC}/include/ \ -I${MTK_PLAT_SOC}/drivers/ \ @@ -46,18 +46,18 @@ BL31_SOURCES += common/desc_image_load.c \ lib/cpus/aarch64/cortex_a55.S \ lib/cpus/aarch64/cortex_a76.S \ plat/common/plat_gicv3.c \ - ${MTK_PLAT}/common/drivers/gic600/mt_gic_v3.c \ - ${MTK_PLAT}/common/drivers/gpio/mtgpio_common.c \ - ${MTK_PLAT}/common/drivers/pmic_wrap/pmic_wrap_init_v2.c \ - ${MTK_PLAT}/common/drivers/rtc/rtc_common.c \ - ${MTK_PLAT}/common/drivers/rtc/rtc_mt6359p.c \ - ${MTK_PLAT}/common/drivers/timer/mt_timer.c \ - ${MTK_PLAT}/common/drivers/uart/uart.c \ - ${MTK_PLAT}/common/lpm/mt_lp_rm.c \ ${MTK_PLAT}/common/mtk_cirq.c \ ${MTK_PLAT}/common/mtk_plat_common.c \ ${MTK_PLAT}/common/mtk_sip_svc.c \ ${MTK_PLAT}/common/params_setup.c \ + ${MTK_PLAT}/drivers/gic600/mt_gic_v3.c \ + ${MTK_PLAT}/drivers/gpio/mtgpio_common.c \ + ${MTK_PLAT}/drivers/lpm/mt_lp_rm.c \ + ${MTK_PLAT}/drivers/pmic_wrap/pmic_wrap_init_v2.c \ + ${MTK_PLAT}/drivers/rtc/rtc_common.c \ + ${MTK_PLAT}/drivers/rtc/rtc_mt6359p.c \ + ${MTK_PLAT}/drivers/timer/mt_timer.c \ + ${MTK_PLAT}/drivers/uart/uart.c \ ${MTK_PLAT_SOC}/aarch64/platform_common.c \ ${MTK_PLAT_SOC}/aarch64/plat_helpers.S \ ${MTK_PLAT_SOC}/bl31_plat_setup.c \ diff --git a/plat/mediatek/mt8195/platform.mk b/plat/mediatek/mt8195/platform.mk index 9d5b5c9de..b5d22c4f3 100644 --- a/plat/mediatek/mt8195/platform.mk +++ b/plat/mediatek/mt8195/platform.mk @@ -8,12 +8,12 @@ MTK_PLAT := plat/mediatek MTK_PLAT_SOC := ${MTK_PLAT}/${PLAT} PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ - -I${MTK_PLAT}/common/drivers/gic600/ \ - -I${MTK_PLAT}/common/drivers/gpio/ \ - -I${MTK_PLAT}/common/drivers/rtc/ \ - -I${MTK_PLAT}/common/drivers/timer/ \ - -I${MTK_PLAT}/common/drivers/uart/ \ - -I${MTK_PLAT}/common/lpm/ \ + -I${MTK_PLAT}/drivers/gic600/ \ + -I${MTK_PLAT}/drivers/gpio/ \ + -I${MTK_PLAT}/drivers/lpm/ \ + -I${MTK_PLAT}/drivers/rtc/ \ + -I${MTK_PLAT}/drivers/timer/ \ + -I${MTK_PLAT}/drivers/uart/ \ -I${MTK_PLAT}/include/ \ -I${MTK_PLAT_SOC}/drivers/apusys/ \ -I${MTK_PLAT_SOC}/drivers/dcm \ @@ -24,7 +24,7 @@ PLAT_INCLUDES := -I${MTK_PLAT}/common/ \ -I${MTK_PLAT_SOC}/drivers/mcdi/ \ -I${MTK_PLAT_SOC}/drivers/pmic/ \ -I${MTK_PLAT_SOC}/drivers/spmc/ \ - -I${MTK_PLAT_SOC}/drivers/ptp3/ \ + -I${MTK_PLAT_SOC}/drivers/ptp3/ \ -I${MTK_PLAT_SOC}/include/ GICV3_SUPPORT_GIC600 := 1 @@ -46,24 +46,24 @@ BL31_SOURCES += common/desc_image_load.c \ lib/cpus/aarch64/cortex_a55.S \ lib/cpus/aarch64/cortex_a78.S \ plat/common/plat_gicv3.c \ - ${MTK_PLAT}/common/drivers/gic600/mt_gic_v3.c \ - ${MTK_PLAT}/common/drivers/gpio/mtgpio_common.c \ - ${MTK_PLAT}/common/drivers/pmic_wrap/pmic_wrap_init_v2.c \ - ${MTK_PLAT}/common/drivers/rtc/rtc_common.c \ - ${MTK_PLAT}/common/drivers/rtc/rtc_mt6359p.c \ - ${MTK_PLAT}/common/drivers/timer/mt_timer.c \ - ${MTK_PLAT}/common/drivers/uart/uart.c \ - ${MTK_PLAT}/common/lpm/mt_lp_rm.c \ ${MTK_PLAT}/common/mtk_cirq.c \ ${MTK_PLAT}/common/mtk_plat_common.c \ ${MTK_PLAT}/common/mtk_sip_svc.c \ ${MTK_PLAT}/common/params_setup.c \ + ${MTK_PLAT}/drivers/gic600/mt_gic_v3.c \ + ${MTK_PLAT}/drivers/gpio/mtgpio_common.c \ + ${MTK_PLAT}/drivers/lpm/mt_lp_rm.c \ + ${MTK_PLAT}/drivers/pmic_wrap/pmic_wrap_init_v2.c \ + ${MTK_PLAT}/drivers/rtc/rtc_common.c \ + ${MTK_PLAT}/drivers/rtc/rtc_mt6359p.c \ + ${MTK_PLAT}/drivers/timer/mt_timer.c \ + ${MTK_PLAT}/drivers/uart/uart.c \ ${MTK_PLAT_SOC}/aarch64/platform_common.c \ ${MTK_PLAT_SOC}/aarch64/plat_helpers.S \ ${MTK_PLAT_SOC}/bl31_plat_setup.c \ ${MTK_PLAT_SOC}/drivers/apusys/apupll.c \ ${MTK_PLAT_SOC}/drivers/apusys/apupwr_clkctl.c \ - ${MTK_PLAT_SOC}/drivers/apusys/mtk_apusys.c \ + ${MTK_PLAT_SOC}/drivers/apusys/mtk_apusys.c \ ${MTK_PLAT_SOC}/drivers/dcm/mtk_dcm.c \ ${MTK_PLAT_SOC}/drivers/dcm/mtk_dcm_utils.c \ ${MTK_PLAT_SOC}/drivers/dfd/plat_dfd.c \ @@ -73,7 +73,7 @@ BL31_SOURCES += common/desc_image_load.c \ ${MTK_PLAT_SOC}/drivers/mcdi/mt_cpu_pm.c \ ${MTK_PLAT_SOC}/drivers/mcdi/mt_cpu_pm_cpc.c \ ${MTK_PLAT_SOC}/drivers/mcdi/mt_mcdi.c \ - ${MTK_PLAT_SOC}/drivers/mcdi/mt_lp_irqremain.c \ + ${MTK_PLAT_SOC}/drivers/mcdi/mt_lp_irqremain.c \ ${MTK_PLAT_SOC}/drivers/gpio/mtgpio.c \ ${MTK_PLAT_SOC}/drivers/pmic/pmic.c \ ${MTK_PLAT_SOC}/drivers/ptp3/mtk_ptp3_main.c \ -- 2.39.5