From 0f9af5500e7bc524debe3affd1a9cb406102ab9a Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 1 May 2018 14:57:28 -0600 Subject: arch/x86: reduce complexity in assembly_entry.S Now that VBOOT_STARTS_IN_BOOTBLOCK depends on C_ENVIRONMENT_BOOTBLOCK, remove the complications in assembly_entry.S. There's no platform utilizing romcc bootblock and needing to handle verified boot after bootblock as well as not using verified boot. That combination makes things very complicated. Clean up the complication as it's not a combination that needs to be supported. BUG=b:78656686 Change-Id: Ie2960790d60ccb8d5b75dab507fe70a6563b3d34 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/25968 Reviewed-by: Furquan Shaikh Reviewed-by: Justin TerAvest Reviewed-by: Hannah Williams Tested-by: build bot (Jenkins) --- src/arch/x86/assembly_entry.S | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/assembly_entry.S b/src/arch/x86/assembly_entry.S index e5e7d4835b..a5399b74a5 100644 --- a/src/arch/x86/assembly_entry.S +++ b/src/arch/x86/assembly_entry.S @@ -16,33 +16,21 @@ #include -/* - *Take the path where CAR_GLOBAL variables just need to be cleared when - * verstage runs directly after bootblock. - */ -#define ROMSTAGE_AFTER_VERSTAGE \ - (IS_ENABLED(CONFIG_VBOOT_SEPARATE_VERSTAGE) && \ - IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK) && ENV_ROMSTAGE) - -#if IS_ENABLED(CONFIG_C_ENVIRONMENT_BOOTBLOCK) || ROMSTAGE_AFTER_VERSTAGE +#if IS_ENABLED(CONFIG_C_ENVIRONMENT_BOOTBLOCK) /* * This path is for stages that are post bootblock when employing - * CONFIG_C_ENVIRONMENT_BOOTBLOCK or any intermediate stage succeeding - * the first stage to initialize protected mode. There's no need to re-load - * the gdt, etc as all those settings are cached within the processor. In - * order to continue with C code execution one needs to set stack pointer and + * CONFIG_C_ENVIRONMENT_BOOTBLOCK. There's no need to re-load the gdt, + * etc as all those settings are cached within the processor. In order + * to continue with C code execution one needs to set stack pointer and * clear CAR_GLOBAL variables that are stage specific. */ .section ".text._start", "ax", @progbits .global _start _start: -/* _car_stack_end symbol is only valid when bootblock does CAR setup. */ -#if IS_ENABLED(CONFIG_C_ENVIRONMENT_BOOTBLOCK) /* reset stack pointer to CAR stack */ mov $_car_stack_end, %esp -#endif /* clear CAR_GLOBAL area as it is not shared */ cld -- cgit v1.2.3