arch/x86/asembly_entry: reorder conditional stage entry macros

The path that just clears CAR_GLOBAL variables and jumps
to the stage entry point needs another condition for
separate verstage just after bootblock. However, the
current conditional is a negative conditional so
swap the logic around to make it easier to extend.

Change-Id: Iab6682498054715a6eaa0476390da6355238b9bc
Signed-off-by: Aaron Durbin <>
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <>
Reviewed-by: Andrey Petrov <>
Reviewed-by: Leroy P Leahy <>
1 file changed