diff options
Diffstat (limited to 'arch/x86/cpu/start.S')
| -rw-r--r-- | arch/x86/cpu/start.S | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index a0dec39abe..e5c1733e59 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -42,6 +42,13 @@ _x86boot_start: /* Tell 32-bit code it is being entered from an in-RAM copy */ movl $GD_FLG_WARM_BOOT, %ebx + + /* + * Zero the BIST (Built-In Self Test) value since we don't have it. + * It must be 0 or the previous loader would have reported an error. + */ + movl $0, %ebp + jmp 1f /* Add a way for tools to discover the _start entry point */ @@ -53,9 +60,13 @@ _start: * Set %ebx to GD_FLG_COLD_BOOT to indicate this. */ movl $GD_FLG_COLD_BOOT, %ebx -1: + /* Save BIST */ movl %eax, %ebp +1: + + /* Save table pointer */ + movl %ecx, %esi /* Load the segement registers to match the GDT loaded in start16.S */ movl $(X86_GDT_ENTRY_32BIT_DS * X86_GDT_ENTRY_SIZE), %eax @@ -133,7 +144,13 @@ car_init_ret: movl %esi, (%edx) skip_hob: +#else + /* Store table pointer */ + movl %esp, %edx + addl $GD_TABLE, %edx + movl %esi, (%edx) #endif + /* Setup first parameter to setup_gdt, pointer to global_data */ movl %esp, %eax |