summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYidi Lin <yidi.lin@mediatek.com>2015-11-25 11:51:11 +0800
committerPatrick Georgi <pgeorgi@google.com>2016-01-22 22:15:22 +0100
commit767b45fe962c87339d4a990b6f1371fe75555e09 (patch)
tree9c89a4a17df6fc67c06794958f6c56b57c270ad8 /src
parent82d9a31d9edb89077b137f7a92776e5103bb0ec8 (diff)
downloadcoreboot-767b45fe962c87339d4a990b6f1371fe75555e09.tar.xz
mediatek/mt8173: move rtc_boot() to romstage
BRANCH=none BUG=none TEST=boot to kernel Change-Id: I0630d7c172e97f81abb1722afe028542e9e7f106 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 608c66df0543c76be7e811b06718464776631b55 Original-Change-Id: I03426085121bfa44c99c351d63db28f567d0ee1d Original-Signed-off-by: Yidi Lin <yidi.lin@mediatek.com> Original-Reviewed-on: https://chromium-review.googlesource.com/313969 Original-Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/13097 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/oak/romstage.c3
-rw-r--r--src/soc/mediatek/mt8173/Makefile.inc4
-rw-r--r--src/soc/mediatek/mt8173/bootblock.c3
3 files changed, 6 insertions, 4 deletions
diff --git a/src/mainboard/google/oak/romstage.c b/src/mainboard/google/oak/romstage.c
index eecf49184c..a60a50dcaa 100644
--- a/src/mainboard/google/oak/romstage.c
+++ b/src/mainboard/google/oak/romstage.c
@@ -27,6 +27,7 @@
#include <timestamp.h>
#include <soc/mmu_operations.h>
+#include <soc/rtc.h>
void main(void)
{
@@ -36,6 +37,8 @@ void main(void)
console_init();
exception_init();
+ rtc_boot();
+
mt8173_mmu_after_dram();
run_ramstage();
diff --git a/src/soc/mediatek/mt8173/Makefile.inc b/src/soc/mediatek/mt8173/Makefile.inc
index 5a2406e69f..cbc98555fe 100644
--- a/src/soc/mediatek/mt8173/Makefile.inc
+++ b/src/soc/mediatek/mt8173/Makefile.inc
@@ -26,7 +26,7 @@ bootblock-$(CONFIG_DRIVERS_UART) += uart.c
endif
bootblock-y += gpio.c gpio_init.c pmic_wrap.c mt6391.c
-bootblock-y += wdt.c rtc.c
+bootblock-y += wdt.c
bootblock-y += mmu_operations.c
################################################################################
@@ -49,7 +49,9 @@ romstage-$(CONFIG_DRIVERS_UART) += uart.c
romstage-y += cbmem.c
romstage-y += spi.c
romstage-y += gpio.c
+romstage-y += pmic_wrap.c mt6391.c
romstage-y += mmu_operations.c
+romstage-y += rtc.c
################################################################################
diff --git a/src/soc/mediatek/mt8173/bootblock.c b/src/soc/mediatek/mt8173/bootblock.c
index ac1fd3ab39..7fe879c4b9 100644
--- a/src/soc/mediatek/mt8173/bootblock.c
+++ b/src/soc/mediatek/mt8173/bootblock.c
@@ -17,7 +17,6 @@
#include <soc/mmu_operations.h>
#include <soc/mt6391.h>
#include <soc/pll.h>
-#include <soc/rtc.h>
#include <soc/wdt.h>
void bootblock_soc_init(void)
@@ -34,6 +33,4 @@ void bootblock_soc_init(void)
/* init watch dog, will disable AP watch dog */
mtk_wdt_init();
-
- rtc_boot();
}