From 94d9411415e624f70ba8451886e5b96a1f56b159 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 16 Mar 2017 19:21:51 -0700 Subject: vboot: Remove CHIPSET_PROVIDES_VERSTAGE_MAIN_SYMBOL Kconfig option CHIPSET_PROVIDES_VERSTAGE_MAIN_SYMBOL allows the SoC directory to provide its own main() symbol that can execute code before the generic verstage code runs. We have now established in other places (e.g. T210 ramstage) a sort of convention that SoCs which need to run code in any stage before main() should just override stage_entry() instead. This patch aligns the verstage with that model and gets rid of the extra Kconfig option. This also removes the need for aliasing between main() and verstage(). Like other stages the main verstage code is now just in main() and can be called from stage_entry(). Change-Id: If42c9c4fbab51fbd474e1530023a30b69495d1d6 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/18978 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/vboot/vboot_common.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/vboot/vboot_common.h') diff --git a/src/vboot/vboot_common.h b/src/vboot/vboot_common.h index 956b54c196..aa01f28944 100644 --- a/src/vboot/vboot_common.h +++ b/src/vboot/vboot_common.h @@ -97,11 +97,10 @@ int vboot_platform_is_resuming(void); /* ============================= VERSTAGE ================================== */ /* - * Main logic for verified boot. verstage() is the stage entry point - * while the verstage_main() is just the core logic. + * Main logic for verified boot. verstage_main() is just the core vboot logic. + * If the verstage is a separate stage, it should be entered via main(). */ void verstage_main(void); -void verstage(void); void verstage_mainboard_init(void); /* Check boot modes */ -- cgit v1.2.3