summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2015-07-07 19:25:14 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-07-07 20:07:41 +0200
commit3957ddc41408a85a509b9f0f39b2aafc05c6eb18 (patch)
tree62d132da5679f15e5d74c820407c7235f544f7dc /src
parent1936f6cf25bee5a0eb313d6734df7af871757e7c (diff)
downloadcoreboot-3957ddc41408a85a509b9f0f39b2aafc05c6eb18.tar.xz
marvel/bg4cd: move timestamp init to SoC code
No need to repeat this in the mainboard code (even if there's only one right now). Change-Id: Iaa3508c27f8c38cfa343ab1d8a094ce922dec157 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: http://review.coreboot.org/10825 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/cosmos/romstage.c28
-rw-r--r--src/soc/marvell/bg4cd/bootblock.c2
2 files changed, 9 insertions, 21 deletions
diff --git a/src/mainboard/google/cosmos/romstage.c b/src/mainboard/google/cosmos/romstage.c
index 0988beeb6c..e10b3ac782 100644
--- a/src/mainboard/google/cosmos/romstage.c
+++ b/src/mainboard/google/cosmos/romstage.c
@@ -37,37 +37,23 @@
void main(void)
{
-#if CONFIG_COLLECT_TIMESTAMPS
- uint64_t start_romstage_time;
- uint64_t before_dram_time;
- uint64_t after_dram_time;
- uint64_t base_time = timestamp_get();
- start_romstage_time = timestamp_get();
-#endif
+ timestamp_add_now(TS_START_ROMSTAGE);
console_init();
-#if CONFIG_COLLECT_TIMESTAMPS
- before_dram_time = timestamp_get();
-#endif
+ timestamp_add_now(TS_BEFORE_INITRAM);
+
sdram_init();
-#if CONFIG_COLLECT_TIMESTAMPS
- after_dram_time = timestamp_get();
-#endif
+
+ timestamp_add_now(TS_AFTER_INITRAM);
+
mmu_init();
mmu_config_range(0, 4096, DCACHE_OFF);
dcache_mmu_enable();
cbmem_initialize_empty();
-#if CONFIG_COLLECT_TIMESTAMPS
- timestamp_init(base_time);
- timestamp_add(TS_START_ROMSTAGE, start_romstage_time);
- timestamp_add(TS_BEFORE_INITRAM, before_dram_time);
- timestamp_add(TS_AFTER_INITRAM, after_dram_time);
-#endif
-#if CONFIG_COLLECT_TIMESTAMPS
timestamp_add_now(TS_END_ROMSTAGE);
-#endif
+
run_ramstage();
}
diff --git a/src/soc/marvell/bg4cd/bootblock.c b/src/soc/marvell/bg4cd/bootblock.c
index e7893fe502..79b9d3f2a1 100644
--- a/src/soc/marvell/bg4cd/bootblock.c
+++ b/src/soc/marvell/bg4cd/bootblock.c
@@ -19,10 +19,12 @@
#include <console/console.h>
#include <program_loading.h>
+#include <timestamp.h>
#include <vendorcode/google/chromeos/chromeos.h>
void main(void)
{
console_init();
+ timestamp_init(timestamp_get());
run_romstage();
}