From 362a73409103ae076172ea58f3f1c1a8fbdc6b00 Mon Sep 17 00:00:00 2001 From: Tristan Shieh Date: Wed, 6 Jun 2018 14:03:22 +0800 Subject: [PATCH] mediatek: Move uart, timer and cbmem code to a common directory. This patch moves uart, timer and cbmem code which can be reused into a common directory under soc/mediatek. BUG=b:80501386 BRANCH=none TEST=the refactored code works fine on the new platform (with the rest of the patches applied) and Elm platform Change-Id: I5210149b324947ee90f1a481b42f0e2e1f7cfc25 Signed-off-by: Tristan Shieh Reviewed-on: https://review.coreboot.org/26658 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Hung-Te Lin --- src/soc/mediatek/{mt8173 => common}/cbmem.c | 2 +- .../{mt8173 => common}/include/soc/timer.h | 2 +- .../{mt8173/common_timer.c => common/timer.c} | 0 src/soc/mediatek/{mt8173 => common}/uart.c | 2 +- src/soc/mediatek/mt8173/Makefile.inc | 21 ++++++++++--------- 5 files changed, 14 insertions(+), 13 deletions(-) rename src/soc/mediatek/{mt8173 => common}/cbmem.c (95%) rename src/soc/mediatek/{mt8173 => common}/include/soc/timer.h (97%) rename src/soc/mediatek/{mt8173/common_timer.c => common/timer.c} (100%) rename src/soc/mediatek/{mt8173 => common}/uart.c (99%) diff --git a/src/soc/mediatek/mt8173/cbmem.c b/src/soc/mediatek/common/cbmem.c similarity index 95% rename from src/soc/mediatek/mt8173/cbmem.c rename to src/soc/mediatek/common/cbmem.c index 31ea1baef4..8906565bd5 100644 --- a/src/soc/mediatek/mt8173/cbmem.c +++ b/src/soc/mediatek/common/cbmem.c @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright 2015 MediaTek Inc. + * Copyright 2018 MediaTek Inc. * * 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 diff --git a/src/soc/mediatek/mt8173/include/soc/timer.h b/src/soc/mediatek/common/include/soc/timer.h similarity index 97% rename from src/soc/mediatek/mt8173/include/soc/timer.h rename to src/soc/mediatek/common/include/soc/timer.h index e876971d06..babcbba561 100644 --- a/src/soc/mediatek/mt8173/include/soc/timer.h +++ b/src/soc/mediatek/common/include/soc/timer.h @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright 2015 MediaTek Inc. + * Copyright 2018 MediaTek Inc. * * 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 diff --git a/src/soc/mediatek/mt8173/common_timer.c b/src/soc/mediatek/common/timer.c similarity index 100% rename from src/soc/mediatek/mt8173/common_timer.c rename to src/soc/mediatek/common/timer.c diff --git a/src/soc/mediatek/mt8173/uart.c b/src/soc/mediatek/common/uart.c similarity index 99% rename from src/soc/mediatek/mt8173/uart.c rename to src/soc/mediatek/common/uart.c index 961e3eb9be..cfc469bed6 100644 --- a/src/soc/mediatek/mt8173/uart.c +++ b/src/soc/mediatek/common/uart.c @@ -1,7 +1,7 @@ /* * This file is part of the coreboot project. * - * Copyright 2015 MediaTek Inc. + * Copyright 2018 MediaTek Inc. * * 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 diff --git a/src/soc/mediatek/mt8173/Makefile.inc b/src/soc/mediatek/mt8173/Makefile.inc index 3aa463a928..3bb0ae0b31 100644 --- a/src/soc/mediatek/mt8173/Makefile.inc +++ b/src/soc/mediatek/mt8173/Makefile.inc @@ -20,11 +20,11 @@ bootblock-$(CONFIG_SPI_FLASH) += flash_controller.c bootblock-y += i2c.c bootblock-y += pll.c bootblock-y += spi.c -bootblock-y += common_timer.c +bootblock-y += ../common/timer.c bootblock-y += timer.c ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) -bootblock-$(CONFIG_DRIVERS_UART) += uart.c +bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c endif bootblock-y += gpio.c gpio_init.c pmic_wrap.c mt6391.c @@ -36,9 +36,9 @@ bootblock-y += mmu_operations.c verstage-y += i2c.c verstage-y += spi.c -verstage-$(CONFIG_DRIVERS_UART) += uart.c +verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c -verstage-y += common_timer.c +verstage-y += ../common/timer.c verstage-y += timer.c verstage-y += wdt.c verstage-$(CONFIG_SPI_FLASH) += flash_controller.c @@ -48,11 +48,11 @@ verstage-y += gpio.c romstage-$(CONFIG_SPI_FLASH) += flash_controller.c romstage-y += pll.c -romstage-y += common_timer.c +romstage-y += ../common/timer.c romstage-y += timer.c -romstage-$(CONFIG_DRIVERS_UART) += uart.c -romstage-y += cbmem.c +romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +romstage-y += ../common/cbmem.c romstage-y += spi.c romstage-y += gpio.c romstage-y += pmic_wrap.c mt6391.c @@ -63,13 +63,13 @@ romstage-y += rtc.c ################################################################################ -ramstage-y += cbmem.c emi.c +ramstage-y += ../common/cbmem.c emi.c ramstage-y += spi.c ramstage-$(CONFIG_SPI_FLASH) += flash_controller.c ramstage-y += soc.c mtcmos.c -ramstage-y += common_timer.c +ramstage-y += ../common/timer.c ramstage-y += timer.c -ramstage-$(CONFIG_DRIVERS_UART) += uart.c +ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c ramstage-y += pmic_wrap.c mt6391.c i2c.c ramstage-y += mt6311.c ramstage-y += da9212.c @@ -94,5 +94,6 @@ $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin ./util/mtkheader/gen-bl-img.py mt8173 sf $< $@ CPPFLAGS_common += -Isrc/soc/mediatek/mt8173/include +CPPFLAGS_common += -Isrc/soc/mediatek/common/include endif