From 9796f60c62f57ac512f225809c10b5b09ef80f5a Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 23 Sep 2015 19:54:12 -0500 Subject: coreboot: move TS_END_ROMSTAGE to one spot While the romstage code flow is not consistent across all mainboards/chipsets there is only one way of running ramstage from romstage -- run_ramstage(). Move the timestamp_add_now(TS_END_ROMSTAGE) to be within run_ramstage(). BUG=chrome-os-partner:44827 BRANCH=None TEST=Built and booted glados. TS_END_ROMSTAGE still present in timestamp table. Change-Id: I4b584e274ce2107e83ca6425491fdc71a138e82c Signed-off-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11700 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/mainboard/google/cosmos/romstage.c | 2 -- src/mainboard/google/daisy/romstage.c | 2 -- src/mainboard/google/link/romstage.c | 2 -- src/mainboard/google/parrot/romstage.c | 1 - src/mainboard/google/peach_pit/romstage.c | 2 -- src/mainboard/google/stout/romstage.c | 1 - src/mainboard/google/veyron/romstage.c | 2 -- src/mainboard/google/veyron_brain/romstage.c | 2 -- src/mainboard/google/veyron_danger/romstage.c | 2 -- src/mainboard/google/veyron_mickey/romstage.c | 2 -- src/mainboard/google/veyron_rialto/romstage.c | 2 -- src/mainboard/google/veyron_romy/romstage.c | 2 -- 12 files changed, 22 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/cosmos/romstage.c b/src/mainboard/google/cosmos/romstage.c index e10b3ac782..0f07354526 100644 --- a/src/mainboard/google/cosmos/romstage.c +++ b/src/mainboard/google/cosmos/romstage.c @@ -53,7 +53,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c index 6f3cb77488..b559c85743 100644 --- a/src/mainboard/google/daisy/romstage.c +++ b/src/mainboard/google/daisy/romstage.c @@ -179,7 +179,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c index e9b4a09859..aa36bc5e75 100644 --- a/src/mainboard/google/link/romstage.c +++ b/src/mainboard/google/link/romstage.c @@ -247,6 +247,4 @@ void main(unsigned long bist) if (CONFIG_LPC_TPM) { init_tpm(boot_mode == 2); } - - timestamp_add_now(TS_END_ROMSTAGE); } diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c index a947c48666..582d9e0322 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/romstage.c @@ -198,5 +198,4 @@ void main(unsigned long bist) if (CONFIG_LPC_TPM) { init_tpm(boot_mode == 2); } - timestamp_add_now(TS_END_ROMSTAGE); } diff --git a/src/mainboard/google/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c index 635877b5e4..d5fdfb1f9a 100644 --- a/src/mainboard/google/peach_pit/romstage.c +++ b/src/mainboard/google/peach_pit/romstage.c @@ -278,7 +278,5 @@ void main(void) simple_spi_test(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c index 31b61e2d72..3d18f182b7 100644 --- a/src/mainboard/google/stout/romstage.c +++ b/src/mainboard/google/stout/romstage.c @@ -252,5 +252,4 @@ void main(unsigned long bist) if (CONFIG_LPC_TPM) { init_tpm(boot_mode == 2); } - timestamp_add_now(TS_END_ROMSTAGE); } diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron/romstage.c index 5ccbe3ec23..a8d8f7deb3 100644 --- a/src/mainboard/google/veyron/romstage.c +++ b/src/mainboard/google/veyron/romstage.c @@ -111,7 +111,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/veyron_brain/romstage.c b/src/mainboard/google/veyron_brain/romstage.c index f243235d7b..e946cc6414 100644 --- a/src/mainboard/google/veyron_brain/romstage.c +++ b/src/mainboard/google/veyron_brain/romstage.c @@ -102,7 +102,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/veyron_danger/romstage.c b/src/mainboard/google/veyron_danger/romstage.c index e9857b8e0b..0c1bb31fd9 100644 --- a/src/mainboard/google/veyron_danger/romstage.c +++ b/src/mainboard/google/veyron_danger/romstage.c @@ -106,7 +106,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/veyron_mickey/romstage.c b/src/mainboard/google/veyron_mickey/romstage.c index f243235d7b..e946cc6414 100644 --- a/src/mainboard/google/veyron_mickey/romstage.c +++ b/src/mainboard/google/veyron_mickey/romstage.c @@ -102,7 +102,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c index 9cdacc3e1a..e845a4228b 100644 --- a/src/mainboard/google/veyron_rialto/romstage.c +++ b/src/mainboard/google/veyron_rialto/romstage.c @@ -112,7 +112,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } diff --git a/src/mainboard/google/veyron_romy/romstage.c b/src/mainboard/google/veyron_romy/romstage.c index f243235d7b..e946cc6414 100644 --- a/src/mainboard/google/veyron_romy/romstage.c +++ b/src/mainboard/google/veyron_romy/romstage.c @@ -102,7 +102,5 @@ void main(void) cbmem_initialize_empty(); - timestamp_add_now(TS_END_ROMSTAGE); - run_ramstage(); } -- cgit v1.2.3