diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-08 10:51:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-08 10:51:00 -0500 |
| commit | b38c3a641fc01fcd4eda5fa107ae3c247baa0196 (patch) | |
| tree | f35ad6e8999c51ff9369843db699287a3f383a78 | |
| parent | d79ae6aa3087a6434b5ecdb51d20dca20c8e1596 (diff) | |
| parent | 90ab311a7c1ee91201c23726871d20b2287a51a5 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- 16-bit start up codes clean up
| -rw-r--r-- | arch/x86/cpu/start16.S | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 474efe4df5..54f4ff6662 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -13,8 +13,6 @@ #include <asm/processor-flags.h> #define BOOT_SEG 0xffff0000 /* linear segment of boot code */ -#define a32 .byte 0x67; -#define o32 .byte 0x66; .section .start16, "ax" .code16 @@ -33,8 +31,8 @@ start16: wbinvd /* load the temporary Global Descriptor Table */ -o32 cs lidt idt_ptr -o32 cs lgdt gdt_ptr +data32 cs lidt idt_ptr +data32 cs lgdt gdt_ptr /* Now, we enter protected mode */ movl %cr0, %eax @@ -46,10 +44,8 @@ o32 cs lgdt gdt_ptr ff: /* Finally restore BIST and jump to the 32-bit initialization code */ - movw $code32start, %ax - movw %ax, %bp movl %ecx, %eax -o32 cs ljmp *(%bp) +data32 cs ljmp *code32start /* 48-bit far pointer */ code32start: |