summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/assembly_entry.S2
-rw-r--r--src/arch/x86/bootblock_simple.c2
-rw-r--r--src/arch/x86/car.ld2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/x86/assembly_entry.S b/src/arch/x86/assembly_entry.S
index d1f5d61ce7..56a5b630c8 100644
--- a/src/arch/x86/assembly_entry.S
+++ b/src/arch/x86/assembly_entry.S
@@ -21,7 +21,7 @@
* verstage runs directly after bootblock.
*/
#define ROMSTAGE_AFTER_VERSTAGE \
- (IS_ENABLED(CONFIG_SEPARATE_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
diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c
index 8e44add28e..5df279c370 100644
--- a/src/arch/x86/bootblock_simple.c
+++ b/src/arch/x86/bootblock_simple.c
@@ -28,7 +28,7 @@ static void main(unsigned long bist)
#endif
}
-#if CONFIG_SEPARATE_VERSTAGE
+#if CONFIG_VBOOT_SEPARATE_VERSTAGE
const char *target1 = "fallback/verstage";
#else
const char *target1 = "fallback/romstage";
diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 92360096d1..aa579c3c58 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -21,7 +21,7 @@
_car_region_start = . ;
/* Vboot work buffer is completely volatile outside of verstage and
* romstage. Appropriate code needs to handle the transition. */
-#if IS_ENABLED(CONFIG_SEPARATE_VERSTAGE)
+#if IS_ENABLED(CONFIG_VBOOT_SEPARATE_VERSTAGE)
VBOOT2_WORK(., 16K)
#endif
/* Stack for CAR stages. Since it persists across all stages that