soc/mediatek: Clean up Makefile.inc for mt8186, mt8192 and mt8195

Clean up Makefile.inc by sorting entries and moving common entries to
all-y. In this way it is more clear to know what drivers have been
involved in each stage and the hardware differences between each SoC.

BUG=none
TEST=emerge-corsola coreboot
TEST=emerge-asurada coreboot
TEST=emerge-cherry coreboot

Change-Id: Idfc7de36ebf36650f7c6bd1584ef77e2a540cde9
Signed-off-by: Yidi Lin <yidilin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65315
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

3 files changed, 47 insertions, 112 deletions

diff --git a/src/soc/mediatek/mt8186/Makefile.inc b/src/soc/mediatek/mt8186/Makefile.inc
index 5d327e067e..77a6c2833c 100644
--- a/src/soc/mediatek/mt8186/Makefile.inc
+++ b/src/soc/mediatek/mt8186/Makefile.inc
@@ -1,45 +1,29 @@
 ifeq ($(CONFIG_SOC_MEDIATEK_MT8186),y)
 
-bootblock-y += ../common/auxadc.c
+# for bootblock, verstage, romstage, ramstage
+all-y += ../common/flash_controller.c
+all-y += ../common/gpio.c gpio.c
+all-y += ../common/i2c.c i2c.c
+all-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
+all-y += ../common/timer.c timer.c
+all-y += ../common/uart.c
+
 bootblock-y += bootblock.c
 bootblock-y += ../common/eint_event.c
-bootblock-y += ../common/flash_controller.c
 bootblock-y += gic.c
-bootblock-y += ../common/gpio.c gpio.c
-bootblock-y += ../common/i2c.c i2c.c
 bootblock-y += ../common/mmu_operations.c
 bootblock-y += ../common/pll.c pll.c
-bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-bootblock-y += ../common/timer.c timer.c
 bootblock-y += ../common/tracker.c ../common/tracker_v1.c
-bootblock-y += ../common/uart.c
 bootblock-y += ../common/wdt.c wdt.c
 
-verstage-y += ../common/auxadc.c
-verstage-y += ../common/flash_controller.c
-verstage-y += ../common/gpio.c gpio.c
-verstage-y += ../common/i2c.c i2c.c
-verstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-verstage-y += ../common/timer.c timer.c
-verstage-y += ../common/uart.c
-verstage-y += ../common/wdt.c wdt.c
-
-romstage-y += ../common/auxadc.c
 romstage-y += ../common/cbmem.c
 romstage-y += ../common/dram_init.c
 romstage-y += ../common/dramc_param.c
 romstage-y += emi.c
-romstage-y += ../common/flash_controller.c
-romstage-y += ../common/gpio.c gpio.c
-romstage-y += ../common/i2c.c i2c.c
 romstage-y += ../common/memory.c
 romstage-y += ../common/memory_test.c
 romstage-y += ../common/mmu_operations.c ../common/mmu_cmops.c
 romstage-y += ../common/pll.c pll.c
-romstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-romstage-y += ../common/timer.c timer.c
-romstage-y += ../common/uart.c
-romstage-y += ../common/wdt.c wdt.c
 romstage-y += ../common/pmic_wrap.c pmic_wrap.c pmif.c mt6366.c
 romstage-y += ../common/rtc.c ../common/rtc_osc_init.c rtc.c
 
@@ -49,29 +33,22 @@ ramstage-y += devapc.c
 ramstage-y += ../common/dfd.c
 ramstage-y += ../common/dsi.c ../common/mtk_mipi_dphy.c
 ramstage-y += emi.c
-ramstage-y += ../common/flash_controller.c
-ramstage-y += ../common/gpio.c gpio.c
-ramstage-y += ../common/mtcmos.c mtcmos.c
-ramstage-y += ../common/i2c.c i2c.c
 ramstage-y += ../common/mcu.c
 ramstage-y += ../common/mmu_operations.c ../common/mmu_cmops.c
 ramstage-$(CONFIG_COMMONLIB_STORAGE_MMC) += ../common/msdc.c msdc.c
-ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
+ramstage-y += ../common/mtcmos.c mtcmos.c
+ramstage-y += ../common/pmic_wrap.c pmic_wrap.c pmif.c mt6366.c
+ramstage-y += ../common/rtc.c ../common/rtc_osc_init.c rtc.c
 ramstage-y += soc.c
 ramstage-y += ../common/spm.c spm.c
 ramstage-y += ../common/sspm.c
-ramstage-y += ../common/timer.c timer.c
-ramstage-y += ../common/uart.c
 ramstage-y += ../common/usb.c usb.c
-ramstage-y += ../common/wdt.c wdt.c
-ramstage-y += ../common/pmic_wrap.c pmic_wrap.c pmif.c mt6366.c
-ramstage-y += ../common/rtc.c ../common/rtc_osc_init.c rtc.c
-
-BL31_MAKEARGS += PLAT=mt8186
 
 CPPFLAGS_common += -Isrc/soc/mediatek/mt8186/include
 CPPFLAGS_common += -Isrc/soc/mediatek/common/include
 
+BL31_MAKEARGS += PLAT=mt8186
+
 MT8186_BLOB_DIR := 3rdparty/blobs/soc/mediatek/mt8186
 
 mcu-firmware-files := \
diff --git a/src/soc/mediatek/mt8192/Makefile.inc b/src/soc/mediatek/mt8192/Makefile.inc
index ac55a2f9de..783bd02ef2 100644
--- a/src/soc/mediatek/mt8192/Makefile.inc
+++ b/src/soc/mediatek/mt8192/Makefile.inc
@@ -1,47 +1,34 @@
 ifeq ($(CONFIG_SOC_MEDIATEK_MT8192),y)
 
-bootblock-y += ../common/auxadc.c
+# for bootblock, verstage, romstage, ramstage
+all-y += ../common/flash_controller.c
+all-y += ../common/gpio.c gpio.c
+all-y += ../common/i2c.c i2c.c
+all-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
+all-y += ../common/timer.c
+all-y += ../common/uart.c
+
 bootblock-y += bootblock.c
 bootblock-y += ../common/eint_event.c
-bootblock-y += ../common/flash_controller.c
-bootblock-y += ../common/gpio.c gpio.c
-bootblock-y += ../common/i2c.c i2c.c
 bootblock-y += ../common/mmu_operations.c
 bootblock-y += ../common/pll.c pll.c
-bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-bootblock-y += ../common/timer.c
 bootblock-y += ../common/tracker.c ../common/tracker_v2.c
-bootblock-y += ../common/uart.c
 bootblock-y += ../common/wdt.c wdt.c
 
-verstage-y += ../common/auxadc.c
-verstage-y += ../common/flash_controller.c
-verstage-y += ../common/gpio.c gpio.c
-verstage-y += ../common/i2c.c i2c.c
-verstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-verstage-y += ../common/timer.c
-verstage-y += ../common/uart.c
-
 romstage-y += ../common/auxadc.c
 romstage-y += ../common/cbmem.c
 romstage-y += ../common/clkbuf.c srclken_rc.c
 romstage-y += ../common/dram_init.c
 romstage-y += ../common/dramc_param.c
-romstage-y += ../common/flash_controller.c
-romstage-y += ../common/gpio.c gpio.c
-romstage-y += ../common/i2c.c i2c.c
 romstage-y += ../common/memory.c ../common/memory_test.c
 romstage-y += ../common/mmu_operations.c ../common/mmu_cmops.c
 romstage-y += ../common/pll.c pll.c
-romstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-romstage-y += ../common/timer.c
-romstage-y += ../common/uart.c
 romstage-y += ../common/pmif.c ../common/pmif_clk.c pmif_clk.c
 romstage-y += ../common/pmif_spi.c pmif_spi.c
 romstage-y += ../common/pmif_spmi.c pmif_spmi.c
-romstage-y += ../common/rtc.c ../common/rtc_osc_init.c ../common/rtc_mt6359p.c
 romstage-y += ../common/mt6315.c mt6315.c
 romstage-y += ../common/mt6359p.c mt6359p.c
+romstage-y += ../common/rtc.c ../common/rtc_osc_init.c ../common/rtc_mt6359p.c
 
 ramstage-y += apusys.c
 ramstage-y += ../common/auxadc.c
@@ -50,10 +37,6 @@ ramstage-y += devapc.c
 ramstage-y += ../common/dfd.c
 ramstage-y += ../common/dpm.c
 ramstage-y += ../common/dsi.c ../common/mtk_mipi_dphy.c
-ramstage-y += ../common/flash_controller.c
-ramstage-y += ../common/gpio.c gpio.c
-ramstage-y += ../common/i2c.c i2c.c
-ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
 ramstage-y += ../common/mcu.c
 ramstage-y += ../common/mcupm.c
 ramstage-y += ../common/mmu_operations.c ../common/mmu_cmops.c
@@ -64,11 +47,15 @@ ramstage-y += ../common/rtc.c ../common/rtc_mt6359p.c
 ramstage-y += soc.c
 ramstage-y += ../common/spm.c spm.c
 ramstage-y += ../common/sspm.c
-ramstage-y += ../common/timer.c
-ramstage-y += ../common/uart.c
 ramstage-y += ../common/ufs.c
 ramstage-y += ../common/usb.c usb.c
 
+CPPFLAGS_common += -Isrc/soc/mediatek/mt8192/include
+CPPFLAGS_common += -Isrc/soc/mediatek/common/include
+CPPFLAGS_common += -Isrc/vendorcode/mediatek/mt8192/include
+
+BL31_MAKEARGS += PLAT=mt8192
+
 MT8192_BLOB_DIR := 3rdparty/blobs/soc/mediatek/mt8192
 
 mcu-firmware-files := \
@@ -90,15 +77,9 @@ $(DRAM_CBFS)-file := $(MT8192_BLOB_DIR)/dram.elf
 $(DRAM_CBFS)-type := stage
 $(DRAM_CBFS)-compression := $(CBFS_PRERAM_COMPRESS_FLAG)
 ifneq ($(wildcard $($(DRAM_CBFS)-file)),)
-        cbfs-files-y += $(DRAM_CBFS)
+	cbfs-files-y += $(DRAM_CBFS)
 endif
 
-BL31_MAKEARGS += PLAT=mt8192
-
-CPPFLAGS_common += -Isrc/soc/mediatek/mt8192/include
-CPPFLAGS_common += -Isrc/soc/mediatek/common/include
-CPPFLAGS_common += -Isrc/vendorcode/mediatek/mt8192/include
-
 $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin
 	./util/mtkheader/gen-bl-img.py mt8183 sf $< $@
 
diff --git a/src/soc/mediatek/mt8195/Makefile.inc b/src/soc/mediatek/mt8195/Makefile.inc
index 0a305d9961..a96788e874 100644
--- a/src/soc/mediatek/mt8195/Makefile.inc
+++ b/src/soc/mediatek/mt8195/Makefile.inc
@@ -1,59 +1,43 @@
 ifeq ($(CONFIG_SOC_MEDIATEK_MT8195),y)
 
-bootblock-y += ../common/auxadc.c
+# for bootblock, verstage, romstage, ramstage
+all-y += ../common/flash_controller.c
+all-y += ../common/gpio.c gpio.c
+all-y += ../common/i2c.c i2c.c
+all-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
+all-y += ../common/timer.c timer.c
+all-y += ../common/uart.c
+
 bootblock-y += bootblock.c
 bootblock-y += ../common/early_init.c
 bootblock-y += ../common/eint_event.c
-bootblock-y += ../common/flash_controller.c
-bootblock-y += ../common/gpio.c gpio.c
-bootblock-y += ../common/i2c.c i2c.c
 bootblock-y += ../common/mmu_operations.c
-bootblock-y += ../common/tracker.c ../common/tracker_v2.c
 bootblock-$(CONFIG_PCI) += pcie.c
 bootblock-y += ../common/pll.c pll.c
-bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-bootblock-y += ../common/timer.c timer.c
-bootblock-y += ../common/uart.c
+bootblock-y += ../common/tracker.c ../common/tracker_v2.c
 bootblock-y += ../common/wdt.c wdt.c
 
-verstage-y += ../common/auxadc.c
-verstage-y += ../common/flash_controller.c
-verstage-y += ../common/gpio.c gpio.c
-verstage-y += ../common/i2c.c i2c.c
-verstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-verstage-y += ../common/timer.c timer.c
-verstage-y += ../common/uart.c
-verstage-y += ../common/wdt.c wdt.c
-
-ramstage-y += apusys.c
-ramstage-y += apusys_devapc.c
-romstage-y += ../common/auxadc.c
 romstage-y += ../common/cbmem.c
 romstage-y += ../common/clkbuf.c
 romstage-y += ../common/dram_init.c
 romstage-y += ../common/dramc_param.c
 romstage-y += emi.c
-romstage-y += ../common/flash_controller.c
-romstage-y += ../common/gpio.c gpio.c
-romstage-y += ../common/i2c.c i2c.c
 romstage-y += ../common/memory.c
 romstage-y += ../common/memory_test.c
 romstage-y += ../common/mmu_operations.c ../common/mmu_cmops.c
 romstage-y += ../common/pll.c pll.c
 romstage-y += scp.c
-romstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
-romstage-y += ../common/timer.c timer.c
-romstage-y += ../common/uart.c
-romstage-y += ../common/wdt.c wdt.c
 romstage-y += ../common/pmif.c ../common/pmif_clk.c pmif_clk.c
 romstage-y += ../common/pmif_spi.c pmif_spi.c
 romstage-y += ../common/pmif_spmi.c pmif_spmi.c
 romstage-y += ../common/mt6315.c mt6315.c
 romstage-y += ../common/mt6359p.c mt6359p.c
-romstage-y += mt6691.c
 romstage-y += mt6360.c
+romstage-y += mt6691.c
 romstage-y += ../common/rtc.c ../common/rtc_osc_init.c ../common/rtc_mt6359p.c
 
+ramstage-y += apusys.c
+ramstage-y += apusys_devapc.c
 ramstage-y += ../common/auxadc.c
 ramstage-y += ../common/early_init.c
 ramstage-y += ../common/ddp.c ddp.c
@@ -63,29 +47,26 @@ ramstage-y += ../common/dpm.c
 ramstage-$(CONFIG_DPM_FOUR_CHANNEL) += dpm_4ch.c
 ramstage-y += dp_intf.c dptx.c dptx_hal.c
 ramstage-y += emi.c
-ramstage-y += ../common/flash_controller.c
-ramstage-y += ../common/gpio.c gpio.c
 ramstage-y += hdmi.c
-ramstage-y += ../common/i2c.c i2c.c
 ramstage-y += ../common/mcu.c
 ramstage-y += ../common/mcupm.c
 ramstage-y += ../common/mmu_operations.c ../common/mmu_cmops.c
+ramstage-$(CONFIG_COMMONLIB_STORAGE_MMC) += ../common/msdc.c msdc.c
 ramstage-y += mt6360.c
 ramstage-y += ../common/mtcmos.c mtcmos.c
-ramstage-$(CONFIG_COMMONLIB_STORAGE_MMC) += ../common/msdc.c msdc.c
 ramstage-$(CONFIG_PCI) += ../common/pcie.c pcie.c
 ramstage-y += ../common/pll.c pll.c
 ramstage-y += ../common/pmif.c
 ramstage-y += ../common/rtc.c ../common/rtc_mt6359p.c
-ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
 ramstage-y += soc.c
-ramstage-y += ../common/sspm.c
 ramstage-y += ../common/spm.c spm.c
-ramstage-y += ../common/timer.c timer.c
-ramstage-y += ../common/uart.c
+ramstage-y += ../common/sspm.c
 ramstage-y += ../common/ufs.c
 ramstage-y += ../common/usb.c usb.c
-ramstage-y += ../common/wdt.c wdt.c
+
+CPPFLAGS_common += -Isrc/soc/mediatek/mt8195/include
+CPPFLAGS_common += -Isrc/soc/mediatek/common/include
+CPPFLAGS_common += -Isrc/vendorcode/mediatek/mt8195/include
 
 BL31_MAKEARGS += PLAT=mt8195
 
@@ -113,10 +94,6 @@ ifneq ($(wildcard $($(DRAM_CBFS)-file)),)
 	cbfs-files-y += $(DRAM_CBFS)
 endif
 
-CPPFLAGS_common += -Isrc/soc/mediatek/mt8195/include
-CPPFLAGS_common += -Isrc/soc/mediatek/common/include
-CPPFLAGS_common += -Isrc/vendorcode/mediatek/mt8195/include
-
 $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin
 	./util/mtkheader/gen-bl-img.py mt8183 sf $< $@