summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2018-05-01 14:57:28 -0600
committerAaron Durbin <adurbin@chromium.org>2018-05-03 04:40:44 +0000
commit0f9af5500e7bc524debe3affd1a9cb406102ab9a (patch)
tree0cb048555bed5236eae0a79c4048d5e6f9401e45
parent318fb80b88e2795237c3d585d1b057af01b5a047 (diff)
downloadcoreboot-0f9af5500e7bc524debe3affd1a9cb406102ab9a.tar.xz
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 <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/25968 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Hannah Williams <hannah.williams@intel.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/arch/x86/assembly_entry.S20
1 files changed, 4 insertions, 16 deletions
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 <rules.h>
-/*
- *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